diff --git a/apps/mail-bridge/queue/mail-processor/worker.ts b/apps/mail-bridge/queue/mail-processor/worker.ts
index 29dd8482..06fed48b 100644
--- a/apps/mail-bridge/queue/mail-processor/worker.ts
+++ b/apps/mail-bridge/queue/mail-processor/worker.ts
@@ -648,14 +648,14 @@ export const worker = new Worker<
           }
         };
 
-        const orgShortCode = await db.query.orgs.findFirst({
+        const orgShortcode = await db.query.orgs.findFirst({
           where: eq(orgs.id, orgId),
           columns: {
             shortcode: true
           }
         });
 
-        if (!orgShortCode) {
+        if (!orgShortcode) {
           throw new Error('No org shortcode found');
         }
 
@@ -714,7 +714,7 @@ export const worker = new Worker<
                 cid: attachment.cid || null
               },
               orgPublicId,
-              orgShortCode.shortcode
+              orgShortcode.shortcode
             )
           )
         ).then(
@@ -922,7 +922,7 @@ type PreSignedData = {
 async function uploadAndAttachAttachment(
   input: UploadAndAttachAttachmentInput,
   orgPublicId: TypeId<'org'>,
-  orgShortCode: string
+  orgShortcode: string
 ) {
   const preUpload = (await fetch(
     `${env.STORAGE_URL}/api/attachments/internalPresign`,
@@ -976,7 +976,7 @@ async function uploadAndAttachAttachment(
   });
 
   return {
-    attachmentUrl: `${env.STORAGE_URL}/attachment/${orgShortCode}/${attachmentPublicId}/${input.fileName}`,
+    attachmentUrl: `${env.STORAGE_URL}/attachment/${orgShortcode}/${attachmentPublicId}/${input.fileName}`,
     cid: input.cid,
     inline: input.inline
   };
diff --git a/apps/platform/routes/auth.ts b/apps/platform/routes/auth.ts
index 7f48a12e..1ff5ce0a 100644
--- a/apps/platform/routes/auth.ts
+++ b/apps/platform/routes/auth.ts
@@ -19,7 +19,7 @@ authApi.get('/status', async (c) => {
 authApi.get('/redirection', async (c) => {
   const account = c.get('account');
   if (!account) {
-    return c.json({ defaultOrgShortCode: null }, 401);
+    return c.json({ defaultOrgShortcode: null }, 401);
   }
 
   const accountId = account.id;
@@ -45,7 +45,7 @@ authApi.get('/redirection', async (c) => {
   }
 
   return c.json({
-    defaultOrgShortCode:
+    defaultOrgShortcode:
       accountResponse?.orgMemberships[0]?.org?.shortcode || null
   });
 });
diff --git a/apps/platform/routes/realtime.ts b/apps/platform/routes/realtime.ts
index 2bd133cd..9f5c0388 100644
--- a/apps/platform/routes/realtime.ts
+++ b/apps/platform/routes/realtime.ts
@@ -2,7 +2,7 @@ import { Hono } from 'hono';
 import type { Ctx } from '~platform/ctx';
 import { zValidator } from '@hono/zod-validator';
 import { z } from 'zod';
-import { validateOrgShortCode } from '~platform/utils/orgShortCode';
+import { validateOrgShortcode } from '~platform/utils/orgShortcode';
 import { db } from '@u22n/database';
 import { and, eq } from '@u22n/database/orm';
 import { orgMembers } from '@u22n/database/schema';
@@ -16,7 +16,7 @@ realtimeApi.post(
   zValidator('header', z.object({ 'org-shortcode': z.string() })),
   async (c) => {
     const accountContext = c.get('account');
-    const orgContext = await validateOrgShortCode(
+    const orgContext = await validateOrgShortcode(
       c.req.valid('header')['org-shortcode']
     );
 
diff --git a/apps/platform/trpc/routers/authRouter/passwordRouter.ts b/apps/platform/trpc/routers/authRouter/passwordRouter.ts
index 91589649..5bb3c953 100644
--- a/apps/platform/trpc/routers/authRouter/passwordRouter.ts
+++ b/apps/platform/trpc/routers/authRouter/passwordRouter.ts
@@ -131,7 +131,7 @@ export const passwordRouter = router({
     .output(
       z.object({
         status: z.enum(['NO_2FA_SETUP', '2FA_REQUIRED']),
-        defaultOrgShortCode: z.string().optional()
+        defaultOrgShortcode: z.string().optional()
       })
     )
     .mutation(async ({ ctx, input }) => {
@@ -207,7 +207,7 @@ export const passwordRouter = router({
         );
         return {
           status: '2FA_REQUIRED',
-          defaultOrgShortCode: userResponse.orgMemberships[0]?.org.shortcode
+          defaultOrgShortcode: userResponse.orgMemberships[0]?.org.shortcode
         };
       } else {
         await createLuciaSessionCookie(ctx.event, {
@@ -217,7 +217,7 @@ export const passwordRouter = router({
         });
         return {
           status: 'NO_2FA_SETUP',
-          defaultOrgShortCode: userResponse.orgMemberships[0]?.org.shortcode
+          defaultOrgShortcode: userResponse.orgMemberships[0]?.org.shortcode
         };
       }
     }),
diff --git a/apps/platform/trpc/routers/orgRouter/mail/domainsRouter.ts b/apps/platform/trpc/routers/orgRouter/mail/domainsRouter.ts
index d4e13437..8f2b523b 100644
--- a/apps/platform/trpc/routers/orgRouter/mail/domainsRouter.ts
+++ b/apps/platform/trpc/routers/orgRouter/mail/domainsRouter.ts
@@ -29,7 +29,7 @@ export const domainsRouter = router({
       const iCanHazCaller = iCanHazCallerFactory(ctx);
 
       const canHazDomain = await iCanHazCaller.domain({
-        orgShortCode: input.orgShortCode
+        orgShortcode: input.orgShortcode
       });
       if (!canHazDomain) {
         throw new TRPCError({
diff --git a/apps/platform/trpc/routers/orgRouter/orgCrudRouter.ts b/apps/platform/trpc/routers/orgRouter/orgCrudRouter.ts
index 98547148..84168e07 100644
--- a/apps/platform/trpc/routers/orgRouter/orgCrudRouter.ts
+++ b/apps/platform/trpc/routers/orgRouter/orgCrudRouter.ts
@@ -12,7 +12,7 @@ import { typeIdGenerator } from '@u22n/utils/typeid';
 import { TRPCError } from '@trpc/server';
 import { blockedUsernames, reservedUsernames } from '~platform/utils/signup';
 
-async function validateOrgShortCode(
+async function validateOrgShortcode(
   db: DBType,
   shortcode: string
 ): Promise<{
@@ -49,7 +49,7 @@ async function validateOrgShortCode(
 }
 
 export const crudRouter = router({
-  checkShortCodeAvailability: accountProcedure
+  checkShortcodeAvailability: accountProcedure
     .input(
       z.object({
         shortcode: z
@@ -62,14 +62,14 @@ export const crudRouter = router({
       })
     )
     .query(async ({ ctx, input }) => {
-      return await validateOrgShortCode(ctx.db, input.shortcode);
+      return await validateOrgShortcode(ctx.db, input.shortcode);
     }),
 
   createNewOrg: accountProcedure
     .input(
       z.object({
         orgName: z.string().min(3).max(32),
-        orgShortCode: z
+        orgShortcode: z
           .string()
           .min(5)
           .max(64)
@@ -82,9 +82,9 @@ export const crudRouter = router({
       const { db, account } = ctx;
       const accountId = account.id;
 
-      const shortcodeAvailability = await validateOrgShortCode(
+      const shortcodeAvailability = await validateOrgShortcode(
         db,
-        input.orgShortCode
+        input.orgShortcode
       );
 
       if (!shortcodeAvailability.available) {
@@ -99,7 +99,7 @@ export const crudRouter = router({
       const insertOrgResponse = await db.insert(orgs).values({
         ownerId: accountId,
         name: input.orgName,
-        shortcode: input.orgShortCode,
+        shortcode: input.orgShortcode,
         publicId: newPublicId
       });
       const orgId = +insertOrgResponse.insertId;
@@ -184,13 +184,13 @@ export const crudRouter = router({
         }
       });
 
-      const adminOrgShortCodes = orgMembersQuery
+      const adminOrgShortcodes = orgMembersQuery
         .filter((orgMember) => orgMember.role === 'admin')
         .map((orgMember) => orgMember.org.shortcode);
 
       return {
         userOrgs: orgMembersQuery,
-        adminOrgShortCodes: adminOrgShortCodes
+        adminOrgShortcodes: adminOrgShortcodes
       };
     })
 });
diff --git a/apps/platform/trpc/routers/orgRouter/orgStoreRouter.ts b/apps/platform/trpc/routers/orgRouter/orgStoreRouter.ts
index 06dd4e34..5cc42fcb 100644
--- a/apps/platform/trpc/routers/orgRouter/orgStoreRouter.ts
+++ b/apps/platform/trpc/routers/orgRouter/orgStoreRouter.ts
@@ -53,14 +53,14 @@ export const storeRouter = router({
       ({ org, profile }) => ({
         name: org.name,
         publicId: org.publicId,
-        shortCode: org.shortcode,
+        shortcode: org.shortcode,
         avatarTimestamp: org.avatarTimestamp,
         orgMemberProfile: profile
       })
     );
 
     const currentOrg = orgsTransformed.find(
-      (o) => o.shortCode === input.orgShortCode
+      (o) => o.shortcode === input.orgShortcode
     );
 
     if (!currentOrg) {
diff --git a/apps/platform/trpc/routers/orgRouter/users/invitesRouter.ts b/apps/platform/trpc/routers/orgRouter/users/invitesRouter.ts
index 5338e8c2..0b53ba9b 100644
--- a/apps/platform/trpc/routers/orgRouter/users/invitesRouter.ts
+++ b/apps/platform/trpc/routers/orgRouter/users/invitesRouter.ts
@@ -20,7 +20,7 @@ import {
 } from '@u22n/database/schema';
 import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
 import { nanoIdToken, zodSchemas } from '@u22n/utils/zodSchemas';
-import { refreshOrgShortCodeCache } from '~platform/utils/orgShortCode';
+import { refreshOrgShortcodeCache } from '~platform/utils/orgShortcode';
 import { isAccountAdminOfOrg } from '~platform/utils/account';
 import { TRPCError } from '@trpc/server';
 import { billingTrpcClient } from '~platform/utils/tRPCServerClients';
@@ -343,7 +343,7 @@ export const invitesRouter = router({
         orgPublicId: queryInvitesResponse.org.publicId,
         orgAvatarTimestamp: queryInvitesResponse.org.avatarTimestamp,
         orgName: queryInvitesResponse.org.name,
-        orgShortCode: queryInvitesResponse.org.shortcode,
+        orgShortcode: queryInvitesResponse.org.shortcode,
         loggedIn: userLoggedIn,
         username: username
       };
@@ -466,11 +466,11 @@ export const invitesRouter = router({
         });
       }
 
-      await refreshOrgShortCodeCache(+queryInvitesResponse.orgId);
+      await refreshOrgShortcodeCache(+queryInvitesResponse.orgId);
 
       return {
         success: true,
-        orgShortCode: queryInvitesResponse.org.shortcode
+        orgShortcode: queryInvitesResponse.org.shortcode
       };
     }),
   invalidateInvite: orgAdminProcedure
diff --git a/apps/platform/trpc/routers/userRouter/defaultsRouter.ts b/apps/platform/trpc/routers/userRouter/defaultsRouter.ts
index 63f0d1cd..fd551f01 100644
--- a/apps/platform/trpc/routers/userRouter/defaultsRouter.ts
+++ b/apps/platform/trpc/routers/userRouter/defaultsRouter.ts
@@ -46,7 +46,7 @@ export const defaultsRouter = router({
       const userHasOrgMembership = accountResponse.orgMemberships.length > 0;
 
       return {
-        defaultOrgShortCode:
+        defaultOrgShortcode:
           accountResponse?.orgMemberships[0]?.org?.shortcode || null,
         twoFactorEnabledCorrectly: twoFactorEnabledCorrectly,
         userHasOrgMembership: userHasOrgMembership,
diff --git a/apps/platform/trpc/routers/userRouter/profileRouter.ts b/apps/platform/trpc/routers/userRouter/profileRouter.ts
index e090624e..200d693b 100644
--- a/apps/platform/trpc/routers/userRouter/profileRouter.ts
+++ b/apps/platform/trpc/routers/userRouter/profileRouter.ts
@@ -47,7 +47,7 @@ export const profileRouter = router({
     .input(
       z.object({
         orgPublicId: typeIdValidator('org').optional(),
-        orgShortCode: z.string().min(1).max(32).optional()
+        orgShortcode: z.string().min(1).max(32).optional()
       })
     )
     .query(async ({ ctx, input }) => {
@@ -55,12 +55,12 @@ export const profileRouter = router({
       const accountId = account.id;
 
       let orgId: number | null = null;
-      if (input.orgPublicId || input.orgShortCode) {
+      if (input.orgPublicId || input.orgShortcode) {
         const orgQuery = await db.query.orgs.findFirst({
           where: input.orgPublicId
             ? eq(orgs.publicId, input.orgPublicId)
-            : input.orgShortCode
-              ? eq(orgs.shortcode, input.orgShortCode)
+            : input.orgShortcode
+              ? eq(orgs.shortcode, input.orgShortcode)
               : eq(orgs.id, 0),
           columns: {
             id: true
@@ -68,7 +68,7 @@ export const profileRouter = router({
         });
         orgId = orgQuery?.id || null;
       }
-      if ((input.orgPublicId || input.orgShortCode) && !orgId) {
+      if ((input.orgPublicId || input.orgShortcode) && !orgId) {
         throw new TRPCError({
           code: 'NOT_FOUND',
           message:
diff --git a/apps/platform/trpc/trpc.ts b/apps/platform/trpc/trpc.ts
index 063e777e..9205c5fd 100644
--- a/apps/platform/trpc/trpc.ts
+++ b/apps/platform/trpc/trpc.ts
@@ -1,6 +1,6 @@
 import { TRPCError, initTRPC } from '@trpc/server';
 import superjson from 'superjson';
-import { validateOrgShortCode } from '~platform/utils/orgShortCode';
+import { validateOrgShortcode } from '~platform/utils/orgShortcode';
 import type { TrpcContext } from '~platform/ctx';
 import { z } from 'zod';
 import { env } from '~platform/env';
@@ -53,14 +53,14 @@ export const accountProcedure = publicProcedure.use(isAccountAuthenticated);
 
 export const orgProcedure = publicProcedure
   .use(isAccountAuthenticated)
-  .input(z.object({ orgShortCode: z.string() }))
+  .input(z.object({ orgShortcode: z.string() }))
   .use(({ input, ctx, next }) =>
     ctx.event
       .get('otel')
-      .tracer.startActiveSpan(`Validate orgShortCode`, async (span) => {
-        const { orgShortCode } = input;
-        span.setAttribute('org.shortCode', orgShortCode);
-        const orgData = await validateOrgShortCode(orgShortCode);
+      .tracer.startActiveSpan(`Validate orgShortcode`, async (span) => {
+        const { orgShortcode } = input;
+        span.setAttribute('org.shortcode', orgShortcode);
+        const orgData = await validateOrgShortcode(orgShortcode);
 
         if (!orgData) {
           span.setAttributes({ 'org.found': false });
diff --git a/apps/platform/utils/orgShortCode.ts b/apps/platform/utils/orgShortcode.ts
similarity index 76%
rename from apps/platform/utils/orgShortCode.ts
rename to apps/platform/utils/orgShortcode.ts
index d7612293..d34f3b09 100644
--- a/apps/platform/utils/orgShortCode.ts
+++ b/apps/platform/utils/orgShortcode.ts
@@ -4,17 +4,17 @@ import { orgs } from '@u22n/database/schema';
 import type { OrgContext } from '~platform/ctx';
 import { storage } from '~platform/storage';
 
-export async function validateOrgShortCode(orgShortCode: string) {
-  if (!orgShortCode) return null;
+export async function validateOrgShortcode(orgShortcode: string) {
+  if (!orgShortcode) return null;
 
-  const cachedShortCodeOrgContext =
-    await storage.orgContext.getItem(orgShortCode);
-  if (cachedShortCodeOrgContext) {
-    return cachedShortCodeOrgContext;
+  const cachedShortcodeOrgContext =
+    await storage.orgContext.getItem(orgShortcode);
+  if (cachedShortcodeOrgContext) {
+    return cachedShortcodeOrgContext;
   }
 
   const orgLookupResult = await db.query.orgs.findFirst({
-    where: eq(orgs.shortcode, orgShortCode),
+    where: eq(orgs.shortcode, orgShortcode),
     columns: { id: true, publicId: true, name: true },
     with: {
       members: {
@@ -38,11 +38,11 @@ export async function validateOrgShortCode(orgShortCode: string) {
     name: orgLookupResult.name
   };
 
-  await storage.orgContext.setItem(orgShortCode, orgContext);
+  await storage.orgContext.setItem(orgShortcode, orgContext);
   return orgContext;
 }
 
-export async function refreshOrgShortCodeCache(orgId: number) {
+export async function refreshOrgShortcodeCache(orgId: number) {
   const orgLookupResult = await db.query.orgs.findFirst({
     where: eq(orgs.id, orgId),
     columns: { id: true, publicId: true, shortcode: true, name: true },
diff --git a/apps/storage/api/presign.ts b/apps/storage/api/presign.ts
index f6c83552..8745c1e2 100644
--- a/apps/storage/api/presign.ts
+++ b/apps/storage/api/presign.ts
@@ -17,14 +17,14 @@ export const presignApi = new Hono<Ctx>().get(
   checkSignedIn,
   zValidator(
     'query',
-    z.object({ filename: z.string(), orgShortCode: z.string() })
+    z.object({ filename: z.string(), orgShortcode: z.string() })
   ),
   async (c) => {
     const accountId = c.get('account')?.id!; // we know it's not null here, checked in the middleware
     const data = c.req.valid('query');
 
     const orgQueryResponse = await db.query.orgs.findFirst({
-      where: eq(orgs.shortcode, data.orgShortCode),
+      where: eq(orgs.shortcode, data.orgShortcode),
       columns: {
         id: true,
         publicId: true
diff --git a/apps/storage/proxy/attachment.ts b/apps/storage/proxy/attachment.ts
index 3bae7f7e..60b46d5e 100644
--- a/apps/storage/proxy/attachment.ts
+++ b/apps/storage/proxy/attachment.ts
@@ -12,17 +12,17 @@ import { convoAttachments, orgMembers, orgs } from '@u22n/database/schema';
 import type { Ctx } from '../ctx';
 
 export const attachmentProxy = new Hono<Ctx>().get(
-  '/:orgShortCode/:attachmentId/:filename',
+  '/:orgShortcode/:attachmentId/:filename',
   zValidator(
     'param',
     z.object({
       filename: z.string().transform((f) => decodeURIComponent(f)),
       attachmentId: typeIdValidator('convoAttachments'),
-      orgShortCode: z.string()
+      orgShortcode: z.string()
     })
   ),
   async (c) => {
-    const { filename, attachmentId, orgShortCode } = c.req.valid('param');
+    const { filename, attachmentId, orgShortcode } = c.req.valid('param');
 
     const attachmentQueryResponse = await db.query.convoAttachments.findFirst({
       where: eq(convoAttachments.publicId, attachmentId),
@@ -44,7 +44,7 @@ export const attachmentProxy = new Hono<Ctx>().get(
     }
 
     const orgQueryResponse = await db.query.orgs.findFirst({
-      where: eq(orgs.shortcode, orgShortCode),
+      where: eq(orgs.shortcode, orgShortcode),
       columns: {
         id: true,
         publicId: true
diff --git a/apps/web/src/app/(login)/login/page.tsx b/apps/web/src/app/(login)/login/page.tsx
index 013b82ff..26d72593 100644
--- a/apps/web/src/app/(login)/login/page.tsx
+++ b/apps/web/src/app/(login)/login/page.tsx
@@ -65,13 +65,13 @@ export default function Page() {
 
   const handleLogin = async (values: z.infer<typeof loginSchema>) => {
     try {
-      const { status, defaultOrgShortCode } = await login(values);
+      const { status, defaultOrgShortcode } = await login(values);
       if (status === 'NO_2FA_SETUP') {
-        if (!defaultOrgShortCode) {
+        if (!defaultOrgShortcode) {
           router.push('/join/org');
         } else {
           router.push(
-            `/${defaultOrgShortCode}/settings/user/security?code=NO_2FA_SETUP`
+            `/${defaultOrgShortcode}/settings/user/security?code=NO_2FA_SETUP`
           );
         }
       } else {
diff --git a/apps/web/src/app/[orgShortCode]/_components/atoms.ts b/apps/web/src/app/[orgShortcode]/_components/atoms.ts
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/_components/atoms.ts
rename to apps/web/src/app/[orgShortcode]/_components/atoms.ts
diff --git a/apps/web/src/app/[orgShortCode]/_components/claim-email-identity.tsx b/apps/web/src/app/[orgShortcode]/_components/claim-email-identity.tsx
similarity index 90%
rename from apps/web/src/app/[orgShortCode]/_components/claim-email-identity.tsx
rename to apps/web/src/app/[orgShortcode]/_components/claim-email-identity.tsx
index 75828542..48e352be 100644
--- a/apps/web/src/app/[orgShortCode]/_components/claim-email-identity.tsx
+++ b/apps/web/src/app/[orgShortcode]/_components/claim-email-identity.tsx
@@ -11,7 +11,7 @@ import { useGlobalStore } from '@/src/providers/global-store-provider';
 import Link from 'next/link';
 
 export function ClaimEmailIdentity() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   return (
     // This dialog should be opened when it is mounted
     <Dialog defaultOpen>
@@ -37,7 +37,7 @@ export function ClaimEmailIdentity() {
           </DialogClose>
           <DialogClose asChild>
             <Button asChild>
-              <Link href={`/${orgShortCode}/settings/user/addresses`}>
+              <Link href={`/${orgShortcode}/settings/user/addresses`}>
                 Claim Free @uninbox.me Address
               </Link>
             </Button>
diff --git a/apps/web/src/app/[orgShortCode]/_components/sidebar-content.tsx b/apps/web/src/app/[orgShortcode]/_components/sidebar-content.tsx
similarity index 97%
rename from apps/web/src/app/[orgShortCode]/_components/sidebar-content.tsx
rename to apps/web/src/app/[orgShortcode]/_components/sidebar-content.tsx
index b944481f..9ccef809 100644
--- a/apps/web/src/app/[orgShortCode]/_components/sidebar-content.tsx
+++ b/apps/web/src/app/[orgShortcode]/_components/sidebar-content.tsx
@@ -55,7 +55,7 @@ import {
 import { env } from '@/src/env';
 
 export default function SidebarContent() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   return (
     <div
       className={cn(
@@ -72,7 +72,7 @@ export default function SidebarContent() {
           </span>
           <Link
             className="hover:bg-slate-1 flex w-full max-w-full flex-row items-center gap-2 truncate rounded-lg p-1.5"
-            href={`/${orgShortCode}/convo`}>
+            href={`/${orgShortcode}/convo`}>
             <div className="bg-blue-4 text-blue-9 flex h-6 w-6 items-center justify-center rounded-sm">
               <User
                 weight="bold"
@@ -223,8 +223,8 @@ function OrgMenu() {
                 asChild>
                 <div
                   onClick={() => {
-                    setCurrentOrg(org.shortCode);
-                    router.push(`/${org.shortCode}/convo`);
+                    setCurrentOrg(org.shortcode);
+                    router.push(`/${org.shortcode}/convo`);
                   }}
                   className={
                     'flex w-full cursor-pointer flex-row items-center justify-between gap-2'
@@ -246,7 +246,7 @@ function OrgMenu() {
                       {org.name}
                     </span>
                   </div>
-                  {org.shortCode === currentOrg.shortCode && <Check />}
+                  {org.shortcode === currentOrg.shortcode && <Check />}
                 </div>
               </DropdownMenuItem>
             ))}
@@ -282,7 +282,7 @@ function OrgMenu() {
           <DropdownMenuGroup className={'p-2'}>
             <DropdownMenuItem asChild>
               <Link
-                href={`/${currentOrg.shortCode}/settings`}
+                href={`/${currentOrg.shortcode}/settings`}
                 className="text-slate-11 flex w-full flex-row items-center gap-2 font-medium">
                 <Gear className={'h-4 w-4'} />
                 <span>Settings</span>
diff --git a/apps/web/src/app/[orgShortCode]/_components/sidebar-nav-button.tsx b/apps/web/src/app/[orgShortcode]/_components/sidebar-nav-button.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/_components/sidebar-nav-button.tsx
rename to apps/web/src/app/[orgShortcode]/_components/sidebar-nav-button.tsx
diff --git a/apps/web/src/app/[orgShortCode]/_components/sidebar.tsx b/apps/web/src/app/[orgShortcode]/_components/sidebar.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/_components/sidebar.tsx
rename to apps/web/src/app/[orgShortcode]/_components/sidebar.tsx
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/context-panel.tsx b/apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/context-panel.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/context-panel.tsx
rename to apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/context-panel.tsx
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/convo-views.tsx b/apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/convo-views.tsx
similarity index 91%
rename from apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/convo-views.tsx
rename to apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/convo-views.tsx
index 7f7b4ccb..6bb576dc 100644
--- a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/convo-views.tsx
+++ b/apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/convo-views.tsx
@@ -12,13 +12,13 @@ import { env } from '@/src/env';
 import { usePageTitle } from '@/src/hooks/use-page-title';
 
 export function ConvoView({ convoId }: { convoId: TypeId<'convos'> }) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const {
     data: convoData,
     isLoading: convoDataLoading,
     error: convoError
   } = platform.convos.getConvo.useQuery({
-    orgShortCode,
+    orgShortcode,
     convoPublicId: convoId
   });
 
@@ -30,11 +30,11 @@ export function ConvoView({ convoId }: { convoId: TypeId<'convos'> }) {
       .filter((f) => !f.inline)
       .map((attachment) => ({
         name: attachment.fileName,
-        url: `${env.NEXT_PUBLIC_STORAGE_URL}/attachment/${orgShortCode}/${attachment.publicId}/${attachment.fileName}`,
+        url: `${env.NEXT_PUBLIC_STORAGE_URL}/attachment/${orgShortcode}/${attachment.publicId}/${attachment.fileName}`,
         type: attachment.type,
         publicId: attachment.publicId
       }));
-  }, [convoData, orgShortCode]);
+  }, [convoData, orgShortcode]);
 
   const participantOwnPublicId = convoData?.ownParticipantPublicId;
   const convoHidden = useMemo(
@@ -94,7 +94,7 @@ export function ConvoView({ convoId }: { convoId: TypeId<'convos'> }) {
 }
 
 export function ConvoNotFound() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   usePageTitle('Convo Not Found');
 
   return (
@@ -105,7 +105,7 @@ export function ConvoNotFound() {
           The convo you are looking for does not exist. Please check the URL and
           try again.
         </span>
-        <Link href={`/${orgShortCode}/convo`}>
+        <Link href={`/${orgShortcode}/convo`}>
           <Button>Go back to Convos</Button>
         </Link>
       </div>
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/messages-panel.tsx b/apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/messages-panel.tsx
similarity index 99%
rename from apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/messages-panel.tsx
rename to apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/messages-panel.tsx
index ea59a22b..0465ea17 100644
--- a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/messages-panel.tsx
+++ b/apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/messages-panel.tsx
@@ -40,7 +40,7 @@ export function MessagesPanel({
     ReturnType<typeof formatParticipantData>
   >[];
 }) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   // This is the index of the first item in the list. It is set to a high number to ensure that the list starts at the bottom
   // This also means the list can't be longer than 10000 items (which is fine for our most cases)
   const INVERSE_LIST_START_INDEX = 10000;
@@ -53,7 +53,7 @@ export function MessagesPanel({
     platform.convos.entries.getConvoEntries.useInfiniteQuery(
       {
         convoPublicId: convoId,
-        orgShortCode
+        orgShortcode
       },
       {
         getNextPageParam: (lastPage) => lastPage.cursor ?? undefined,
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/original-message-view.tsx b/apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/original-message-view.tsx
similarity index 96%
rename from apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/original-message-view.tsx
rename to apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/original-message-view.tsx
index 8f13134e..10ba86cf 100644
--- a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/original-message-view.tsx
+++ b/apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/original-message-view.tsx
@@ -14,10 +14,11 @@ export function OriginalMessageView({
   setOpen: (open: boolean) => void;
   messagePublicId: TypeId<'convoEntries'>;
 }) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
+
   const { data, isLoading, error } =
     platform.convos.entries.getConvoSingleEntryRawEmail.useQuery({
-      orgShortCode,
+      orgShortcode: orgShortcode,
       convoEntryPublicId: messagePublicId
     });
 
@@ -98,6 +99,7 @@ const OriginalMessageIframe = memo(
 
     return (
       <iframe
+        title="Raw Email"
         ref={frameRef}
         onLoad={onLoad}
         className="w-full"
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/participants.tsx b/apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/participants.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/participants.tsx
rename to apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/participants.tsx
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/reply-box.tsx b/apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/reply-box.tsx
similarity index 97%
rename from apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/reply-box.tsx
rename to apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/reply-box.tsx
index 9ff17e19..72f3e4c3 100644
--- a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/reply-box.tsx
+++ b/apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/reply-box.tsx
@@ -36,7 +36,7 @@ export function ReplyBox({ convoId }: { convoId: TypeId<'convos'> }) {
   const [editorText, setEditorText] = useState<JSONContent>(
     emptyTiptapEditorContent
   );
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const replyTo = useAtomValue(replyToMessageAtom);
   const addConvoToCache = useUpdateConvoMessageList$Cache();
   const editorRef = useRef<EditorType | null>(null);
@@ -70,11 +70,11 @@ export function ReplyBox({ convoId }: { convoId: TypeId<'convos'> }) {
 
   const { data: emailIdentities, isLoading: emailIdentitiesLoading } =
     platform.org.mail.emailIdentities.getUserEmailIdentities.useQuery({
-      orgShortCode
+      orgShortcode
     });
   const { data: isAdmin } =
     platform.org.users.members.isOrgMemberAdmin.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   useEffect(() => {
@@ -189,7 +189,7 @@ export function ReplyBox({ convoId }: { convoId: TypeId<'convos'> }) {
                 setLoadingType('comment');
                 const { publicId } = await replyToConvoMutation.mutateAsync({
                   attachments: getTrpcUploadFormat(),
-                  orgShortCode,
+                  orgShortcode,
                   message: stringify(editorText),
                   replyToMessagePublicId: replyTo,
                   messageType: 'comment'
@@ -212,7 +212,7 @@ export function ReplyBox({ convoId }: { convoId: TypeId<'convos'> }) {
                 setLoadingType('message');
                 const { publicId } = await replyToConvoMutation.mutateAsync({
                   attachments: getTrpcUploadFormat(),
-                  orgShortCode,
+                  orgShortcode,
                   message: stringify(editorText),
                   replyToMessagePublicId: replyTo,
                   messageType: 'message',
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/top-bar.tsx b/apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/top-bar.tsx
similarity index 95%
rename from apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/top-bar.tsx
rename to apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/top-bar.tsx
index 9c5724bf..8e10e529 100644
--- a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/top-bar.tsx
+++ b/apps/web/src/app/[orgShortcode]/convo/[convoId]/_components/top-bar.tsx
@@ -21,6 +21,8 @@ import {
   File
 } from '@phosphor-icons/react';
 import Link from 'next/link';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { useDeleteConvo$Cache, useToggleConvoHidden$Cache } from '../../utils';
 import useAwaitableModal, {
   type ModalComponent
@@ -60,7 +62,7 @@ export default function TopBar({
   convoHidden: boolean | null;
   subjects: RouterOutputs['convos']['getConvo']['data']['subjects'] | undefined;
 }) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const [ModalRoot, openDeleteModal] = useAwaitableModal(DeleteModal, {
     convoId,
     convoHidden
@@ -76,7 +78,7 @@ export default function TopBar({
             variant={'outline'}
             size={'icon-sm'}
             asChild>
-            <Link href={`/${orgShortCode}/convo`}>
+            <Link href={`/${orgShortcode}/convo`}>
               <CaretLeft size={16} />
             </Link>
           </Button>
@@ -101,7 +103,7 @@ export default function TopBar({
                 onClick={() => {
                   openDeleteModal({ convoHidden })
                     // Navigate to empty page on delete
-                    .then(() => router.push(`/${orgShortCode}/convo`))
+                    .then(() => router.push(`/${orgShortcode}/convo`))
                     // Do nothing if Hide is chosen or Modal is Closed
                     .catch(() => null);
                 }}>
@@ -118,7 +120,7 @@ export default function TopBar({
                 onClick={async () => {
                   await hideConvo.mutateAsync({
                     convoPublicId: convoId,
-                    orgShortCode,
+                    orgShortcode,
                     unhide: convoHidden ? true : undefined
                   });
                 }}>
@@ -165,7 +167,7 @@ function DeleteModal({
   convoId,
   convoHidden
 }: ModalComponent<{ convoId: TypeId<'convos'>; convoHidden: boolean | null }>) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const hideConvo = platform.convos.hideConvo.useMutation();
   const deleteConvo = platform.convos.deleteConvo.useMutation();
   const removeConvoFromList = useDeleteConvo$Cache();
@@ -206,7 +208,7 @@ function DeleteModal({
               onClick={async () => {
                 await hideConvo.mutateAsync({
                   convoPublicId: convoId,
-                  orgShortCode
+                  orgShortcode
                 });
                 onClose();
               }}>
@@ -220,7 +222,7 @@ function DeleteModal({
             onClick={async () => {
               await deleteConvo.mutateAsync({
                 convoPublicId: convoId,
-                orgShortCode
+                orgShortcode
               });
               await removeConvoFromList(convoId);
               onResolve(null);
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/atoms.ts b/apps/web/src/app/[orgShortcode]/convo/[convoId]/atoms.ts
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/convo/[convoId]/atoms.ts
rename to apps/web/src/app/[orgShortcode]/convo/[convoId]/atoms.ts
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/page.tsx b/apps/web/src/app/[orgShortcode]/convo/[convoId]/page.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/convo/[convoId]/page.tsx
rename to apps/web/src/app/[orgShortcode]/convo/[convoId]/page.tsx
diff --git a/apps/web/src/app/[orgShortCode]/convo/_components/convo-list-item.tsx b/apps/web/src/app/[orgShortcode]/convo/_components/convo-list-item.tsx
similarity index 96%
rename from apps/web/src/app/[orgShortCode]/convo/_components/convo-list-item.tsx
rename to apps/web/src/app/[orgShortcode]/convo/_components/convo-list-item.tsx
index 47fed118..d1f1bf96 100644
--- a/apps/web/src/app/[orgShortCode]/convo/_components/convo-list-item.tsx
+++ b/apps/web/src/app/[orgShortcode]/convo/_components/convo-list-item.tsx
@@ -16,7 +16,7 @@ export function ConvoItem({
 }: {
   convo: RouterOutputs['convos']['getOrgMemberConvos']['data'][number];
 }) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
 
   const timeAgo = useTimeAgo(convo.lastUpdatedAt);
 
@@ -55,7 +55,7 @@ export function ConvoItem({
   }, [participantData]);
 
   const currentPath = usePathname();
-  const link = `/${orgShortCode}/convo/${convo.publicId}`;
+  const link = `/${orgShortcode}/convo/${convo.publicId}`;
 
   const isActive = currentPath === link;
 
diff --git a/apps/web/src/app/[orgShortCode]/convo/_components/convo-list.tsx b/apps/web/src/app/[orgShortcode]/convo/_components/convo-list.tsx
similarity index 94%
rename from apps/web/src/app/[orgShortCode]/convo/_components/convo-list.tsx
rename to apps/web/src/app/[orgShortcode]/convo/_components/convo-list.tsx
index ae3982d1..f173ba23 100644
--- a/apps/web/src/app/[orgShortCode]/convo/_components/convo-list.tsx
+++ b/apps/web/src/app/[orgShortcode]/convo/_components/convo-list.tsx
@@ -12,7 +12,7 @@ type Props = {
 };
 
 export function ConvoList(props: Props) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
 
   const {
     data: convos,
@@ -22,7 +22,7 @@ export function ConvoList(props: Props) {
     isFetchingNextPage
   } = platform.convos.getOrgMemberConvos.useInfiniteQuery(
     {
-      orgShortCode,
+      orgShortcode,
       includeHidden: props.hidden ? true : undefined
     },
     {
diff --git a/apps/web/src/app/[orgShortCode]/convo/_components/create-convo-form.tsx b/apps/web/src/app/[orgShortcode]/convo/_components/create-convo-form.tsx
similarity index 98%
rename from apps/web/src/app/[orgShortCode]/convo/_components/create-convo-form.tsx
rename to apps/web/src/app/[orgShortcode]/convo/_components/create-convo-form.tsx
index 26709a54..01b4198c 100644
--- a/apps/web/src/app/[orgShortCode]/convo/_components/create-convo-form.tsx
+++ b/apps/web/src/app/[orgShortcode]/convo/_components/create-convo-form.tsx
@@ -103,21 +103,21 @@ const selectedParticipantsAtom = atom<NewConvoParticipant[]>([]);
 const newEmailParticipantsAtom = atom<string[]>([]);
 
 export default function CreateConvoForm() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
 
   const { data: userEmailIdentities, isLoading: emailIdentitiesLoading } =
     platform.org.mail.emailIdentities.getUserEmailIdentities.useQuery({
-      orgShortCode
+      orgShortcode
     });
   const { data: orgMemberList, isLoading: orgMemberListLoading } =
-    platform.org.users.members.getOrgMembersList.useQuery({ orgShortCode });
+    platform.org.users.members.getOrgMembersList.useQuery({ orgShortcode });
   const { data: orgTeamsData, isLoading: orgTeamsLoading } =
-    platform.org.users.teams.getOrgTeams.useQuery({ orgShortCode });
+    platform.org.users.teams.getOrgTeams.useQuery({ orgShortcode });
   const { data: orgContacts, isLoading: orgContactsLoading } =
-    platform.org.contacts.getOrgContacts.useQuery({ orgShortCode });
+    platform.org.contacts.getOrgContacts.useQuery({ orgShortcode });
   const { data: isAdmin } =
     platform.org.users.members.isOrgMemberAdmin.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   const { mutateAsync: createConvoFn } =
@@ -353,7 +353,7 @@ export default function CreateConvoForm() {
       participantsEmails,
       message: stringify(editorText),
       attachments: getTrpcUploadFormat(),
-      orgShortCode
+      orgShortcode
     });
   }
 
@@ -370,7 +370,7 @@ export default function CreateConvoForm() {
         toast.success('Convo created, redirecting you to your conversion');
         void addConvo(data.publicId).then(() => {
           setNewPanelOpen(false);
-          router.push(`/${orgShortCode}/convo/${data.publicId}`);
+          router.push(`/${orgShortcode}/convo/${data.publicId}`);
         });
       }
     }
@@ -385,7 +385,7 @@ export default function CreateConvoForm() {
       onSuccess: (data) => {
         toast.success('Convo created, redirecting you to your conversion');
         void addConvo(data.publicId).then(() => {
-          router.push(`/${orgShortCode}/convo/${data.publicId}`);
+          router.push(`/${orgShortcode}/convo/${data.publicId}`);
         });
       }
     }
diff --git a/apps/web/src/app/[orgShortCode]/convo/_components/new-convo-sheet.tsx b/apps/web/src/app/[orgShortcode]/convo/_components/new-convo-sheet.tsx
similarity index 96%
rename from apps/web/src/app/[orgShortCode]/convo/_components/new-convo-sheet.tsx
rename to apps/web/src/app/[orgShortcode]/convo/_components/new-convo-sheet.tsx
index 4949dcc7..f4c5f588 100644
--- a/apps/web/src/app/[orgShortCode]/convo/_components/new-convo-sheet.tsx
+++ b/apps/web/src/app/[orgShortcode]/convo/_components/new-convo-sheet.tsx
@@ -11,7 +11,7 @@ import {
   DrawerTitle,
   DrawerTrigger
 } from '@/src/components/shadcn-ui/drawer';
-import { showNewConvoPanel } from '@/src/app/[orgShortCode]/convo/atoms';
+import { showNewConvoPanel } from '@/src/app/[orgShortcode]/convo/atoms';
 import { useAtom } from 'jotai';
 
 export function NewConvoSheet() {
diff --git a/apps/web/src/app/[orgShortCode]/convo/_components/org-issue-alerts.tsx b/apps/web/src/app/[orgShortcode]/convo/_components/org-issue-alerts.tsx
similarity index 94%
rename from apps/web/src/app/[orgShortCode]/convo/_components/org-issue-alerts.tsx
rename to apps/web/src/app/[orgShortcode]/convo/_components/org-issue-alerts.tsx
index 3006790f..7b9aa5c9 100644
--- a/apps/web/src/app/[orgShortCode]/convo/_components/org-issue-alerts.tsx
+++ b/apps/web/src/app/[orgShortcode]/convo/_components/org-issue-alerts.tsx
@@ -25,7 +25,7 @@ export function OrgIssueAlerts({ issues }: { issues: Issues }) {
 }
 
 function RenderAlert({ issue }: { issue: Issues[number] }) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const [issueType, issuePublicId] = issue.id.split(':') as SplitIssue<
     typeof issue.id
   >;
@@ -45,7 +45,7 @@ function RenderAlert({ issue }: { issue: Issues[number] }) {
           <AlertTitle className="text-red-9 font-bold">
             DNS issue detected for your Org domain{' '}
             <Link
-              href={`/${orgShortCode}/settings/org/mail/domains/${issuePublicId}`}
+              href={`/${orgShortcode}/settings/org/mail/domains/${issuePublicId}`}
               className="underline">
               {issue.data.domain}
             </Link>
diff --git a/apps/web/src/app/[orgShortCode]/convo/atoms.ts b/apps/web/src/app/[orgShortcode]/convo/atoms.ts
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/convo/atoms.ts
rename to apps/web/src/app/[orgShortcode]/convo/atoms.ts
diff --git a/apps/web/src/app/[orgShortCode]/convo/layout.tsx b/apps/web/src/app/[orgShortcode]/convo/layout.tsx
similarity index 96%
rename from apps/web/src/app/[orgShortCode]/convo/layout.tsx
rename to apps/web/src/app/[orgShortcode]/convo/layout.tsx
index 38b5afbd..c6b61e2b 100644
--- a/apps/web/src/app/[orgShortCode]/convo/layout.tsx
+++ b/apps/web/src/app/[orgShortcode]/convo/layout.tsx
@@ -39,13 +39,13 @@ import { OrgIssueAlerts } from './_components/org-issue-alerts';
 export default function Layout({
   children
 }: Readonly<{ children: React.ReactNode }>) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const { setSidebarExpanded } = usePreferencesState();
   const isMobile = useIsMobile();
   const [showHidden, setShowHidden] = useState(false);
   const { data: issueData, refetch: refetchIssues } =
     platform.org.store.getOrgIssues.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   const addConvo = useAddSingleConvo$Cache();
@@ -127,7 +127,7 @@ export default function Layout({
                       className="h-4 w-4"
                     />
                   </div>
-                  <BreadcrumbLink href={`/${orgShortCode}/convo`}>
+                  <BreadcrumbLink href={`/${orgShortcode}/convo`}>
                     {showHidden ? 'Hidden Conversations' : 'Conversations'}
                   </BreadcrumbLink>
                 </BreadcrumbItem>
@@ -146,7 +146,7 @@ export default function Layout({
                 variant="default"
                 asChild
                 size="xs">
-                <Link href={`/${orgShortCode}/convo/new`}>New</Link>
+                <Link href={`/${orgShortcode}/convo/new`}>New</Link>
               </Button>
             ) : (
               <Button
diff --git a/apps/web/src/app/[orgShortCode]/convo/new/page.tsx b/apps/web/src/app/[orgShortcode]/convo/new/page.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/convo/new/page.tsx
rename to apps/web/src/app/[orgShortcode]/convo/new/page.tsx
diff --git a/apps/web/src/app/[orgShortCode]/convo/page.tsx b/apps/web/src/app/[orgShortcode]/convo/page.tsx
similarity index 77%
rename from apps/web/src/app/[orgShortCode]/convo/page.tsx
rename to apps/web/src/app/[orgShortcode]/convo/page.tsx
index d31c70a5..3ba6249c 100644
--- a/apps/web/src/app/[orgShortCode]/convo/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/convo/page.tsx
@@ -4,7 +4,7 @@ import { useGlobalStore } from '@/src/providers/global-store-provider';
 import Link from 'next/link';
 
 export default function Page() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
 
   return (
     <div className="flex h-full w-full flex-col items-center justify-center gap-2 p-4">
@@ -12,7 +12,7 @@ export default function Page() {
         Select a Convo from Sidebar or Create a New One
       </span>
       <Button asChild>
-        <Link href={`/${orgShortCode}/convo/new`}>Create New Convo</Link>
+        <Link href={`/${orgShortcode}/convo/new`}>Create New Convo</Link>
       </Button>
     </div>
   );
diff --git a/apps/web/src/app/[orgShortCode]/convo/utils.ts b/apps/web/src/app/[orgShortcode]/convo/utils.ts
similarity index 86%
rename from apps/web/src/app/[orgShortCode]/convo/utils.ts
rename to apps/web/src/app/[orgShortcode]/convo/utils.ts
index 99c2d2ca..33f6508a 100644
--- a/apps/web/src/app/[orgShortCode]/convo/utils.ts
+++ b/apps/web/src/app/[orgShortcode]/convo/utils.ts
@@ -62,7 +62,7 @@ export function formatParticipantData(
 }
 
 export function useAddSingleConvo$Cache() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const utils = platform.useUtils();
   const convoListApi = utils.convos.getOrgMemberConvos;
   const getOrgMemberSpecificConvoApi = utils.convos.getOrgMemberSpecificConvo;
@@ -71,9 +71,9 @@ export function useAddSingleConvo$Cache() {
     async (convoId: TypeId<'convos'>) => {
       const convo = await getOrgMemberSpecificConvoApi.fetch({
         convoPublicId: convoId,
-        orgShortCode
+        orgShortcode
       });
-      convoListApi.setInfiniteData({ orgShortCode }, (updater) => {
+      convoListApi.setInfiniteData({ orgShortcode }, (updater) => {
         if (!updater) return;
         // If convo already exists in the cache, don't add it again
         if (
@@ -88,12 +88,12 @@ export function useAddSingleConvo$Cache() {
         return clonedUpdater;
       });
     },
-    [convoListApi, getOrgMemberSpecificConvoApi, orgShortCode]
+    [convoListApi, getOrgMemberSpecificConvoApi, orgShortcode]
   );
 }
 
 export function useDeleteConvo$Cache() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const convoListApi = platform.useUtils().convos.getOrgMemberConvos;
   const deleteFn = useCallback(
     (
@@ -120,25 +120,25 @@ export function useDeleteConvo$Cache() {
 
   return useCallback(
     async (convoId: TypeId<'convos'>) => {
-      await convoListApi.cancel({ orgShortCode });
-      await convoListApi.cancel({ orgShortCode, includeHidden: true });
+      await convoListApi.cancel({ orgShortcode });
+      await convoListApi.cancel({ orgShortcode, includeHidden: true });
 
-      convoListApi.setInfiniteData({ orgShortCode }, (updater) =>
+      convoListApi.setInfiniteData({ orgShortcode }, (updater) =>
         deleteFn(convoId, updater)
       );
       // deleteFn(convoId, updater)
       convoListApi.setInfiniteData(
-        { orgShortCode, includeHidden: true },
+        { orgShortcode, includeHidden: true },
         (updater) => deleteFn(convoId, updater)
       );
     },
-    [convoListApi, deleteFn, orgShortCode]
+    [convoListApi, deleteFn, orgShortcode]
   );
 }
 
 // TODO: Simplify this function later, its too complex
 export function useToggleConvoHidden$Cache() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const utils = platform.useUtils();
   const convoApi = utils.convos.getConvo;
   const convoListApi = utils.convos.getOrgMemberConvos;
@@ -198,8 +198,8 @@ export function useToggleConvoHidden$Cache() {
 
   return useCallback(
     async (convoId: TypeId<'convos'>, hide = false) => {
-      await convoApi.cancel({ convoPublicId: convoId, orgShortCode });
-      convoApi.setData({ convoPublicId: convoId, orgShortCode }, (updater) => {
+      await convoApi.cancel({ convoPublicId: convoId, orgShortcode });
+      convoApi.setData({ convoPublicId: convoId, orgShortcode }, (updater) => {
         if (!updater) return;
         const clonedUpdater = structuredClone(updater);
         const participantIndex = clonedUpdater.data.participants.findIndex(
@@ -213,16 +213,16 @@ export function useToggleConvoHidden$Cache() {
 
       const convoToAdd = await specificConvoApi.fetch({
         convoPublicId: convoId,
-        orgShortCode
+        orgShortcode
       });
 
       // Update both hidden and non-hidden convo lists
-      await convoListApi.cancel({ orgShortCode, includeHidden: true });
-      await convoListApi.cancel({ orgShortCode });
+      await convoListApi.cancel({ orgShortcode, includeHidden: true });
+      await convoListApi.cancel({ orgShortcode });
 
       // if we are hiding a convo, we need to remove it from the non-hidden list and add to hidden list
       if (hide) {
-        convoListApi.setInfiniteData({ orgShortCode }, (updater) =>
+        convoListApi.setInfiniteData({ orgShortcode }, (updater) =>
           convoListUpdaterFn(
             /* hide from non-hidden */ true,
             null,
@@ -231,7 +231,7 @@ export function useToggleConvoHidden$Cache() {
           )
         );
         convoListApi.setInfiniteData(
-          { orgShortCode, includeHidden: true },
+          { orgShortcode, includeHidden: true },
           (updater) =>
             convoListUpdaterFn(
               /* add from hidden */ false,
@@ -242,7 +242,7 @@ export function useToggleConvoHidden$Cache() {
         );
       } else {
         // if we are un-hiding a convo, we need to remove it from the hidden list and add to non-hidden list
-        convoListApi.setInfiniteData({ orgShortCode }, (updater) =>
+        convoListApi.setInfiniteData({ orgShortcode }, (updater) =>
           convoListUpdaterFn(
             /* add to non-hidden */ false,
             convoToAdd,
@@ -251,7 +251,7 @@ export function useToggleConvoHidden$Cache() {
           )
         );
         convoListApi.setInfiniteData(
-          { orgShortCode, includeHidden: true },
+          { orgShortcode, includeHidden: true },
           (updater) =>
             convoListUpdaterFn(
               /* hide from hidden */ true,
@@ -262,12 +262,12 @@ export function useToggleConvoHidden$Cache() {
         );
       }
     },
-    [convoApi, convoListApi, convoListUpdaterFn, orgShortCode, specificConvoApi]
+    [convoApi, convoListApi, convoListUpdaterFn, orgShortcode, specificConvoApi]
   );
 }
 
 export function useUpdateConvoMessageList$Cache() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const utils = platform.useUtils();
   const convoEntiresApi = utils.convos.entries.getConvoEntries;
   const singleConvoEntryApi = utils.convos.entries.getConvoSingleEntry;
@@ -278,14 +278,14 @@ export function useUpdateConvoMessageList$Cache() {
       convoId: TypeId<'convos'>,
       convoEntryPublicId: TypeId<'convoEntries'>
     ) => {
-      await convoEntiresApi.cancel({ convoPublicId: convoId, orgShortCode });
+      await convoEntiresApi.cancel({ convoPublicId: convoId, orgShortcode });
       const convo = await singleConvoEntryApi.fetch({
         convoPublicId: convoId,
         convoEntryPublicId,
-        orgShortCode
+        orgShortcode
       });
       convoEntiresApi.setInfiniteData(
-        { convoPublicId: convoId, orgShortCode },
+        { convoPublicId: convoId, orgShortcode },
         (updater) => {
           if (!updater) return;
           // If convo entry already exists in the cache, don't add it again
@@ -304,6 +304,6 @@ export function useUpdateConvoMessageList$Cache() {
         }
       );
     },
-    [convoEntiresApi, orgShortCode, singleConvoEntryApi]
+    [convoEntiresApi, orgShortcode, singleConvoEntryApi]
   );
 }
diff --git a/apps/web/src/app/[orgShortCode]/layout.tsx b/apps/web/src/app/[orgShortcode]/layout.tsx
similarity index 90%
rename from apps/web/src/app/[orgShortCode]/layout.tsx
rename to apps/web/src/app/[orgShortcode]/layout.tsx
index 8954724f..d00a0697 100644
--- a/apps/web/src/app/[orgShortCode]/layout.tsx
+++ b/apps/web/src/app/[orgShortcode]/layout.tsx
@@ -12,17 +12,17 @@ import { ClaimEmailIdentity } from './_components/claim-email-identity';
 
 export default function Layout({
   children,
-  params: { orgShortCode }
-}: Readonly<{ children: React.ReactNode; params: { orgShortCode: string } }>) {
+  params: { orgShortcode }
+}: Readonly<{ children: React.ReactNode; params: { orgShortcode: string } }>) {
   const {
     data: storeData,
     isLoading: storeDataLoading,
     error: storeError
-  } = platform.org.store.getStoreData.useQuery({ orgShortCode });
+  } = platform.org.store.getStoreData.useQuery({ orgShortcode });
 
   const { data: hasEmailIdentity } =
     platform.org.mail.emailIdentities.userHasEmailIdentities.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   if (storeDataLoading) {
@@ -56,8 +56,8 @@ export default function Layout({
         <h1 className="text-red-11 text-2xl font-bold">Invalid Org</h1>
 
         <span className="whitespace-pre text-xl">
-          Org with ShortCode{' '}
-          <span className="font-mono underline">{orgShortCode}</span> either
+          Org with Shortcode{' '}
+          <span className="font-mono underline">{orgShortcode}</span> either
           does not exists or you are not part of that org!
         </span>
 
diff --git a/apps/web/src/app/[orgShortCode]/route.tsx b/apps/web/src/app/[orgShortcode]/route.tsx
similarity index 58%
rename from apps/web/src/app/[orgShortCode]/route.tsx
rename to apps/web/src/app/[orgShortcode]/route.tsx
index 7e321c51..c86f91b3 100644
--- a/apps/web/src/app/[orgShortCode]/route.tsx
+++ b/apps/web/src/app/[orgShortcode]/route.tsx
@@ -3,7 +3,7 @@ import { type NextRequest } from 'next/server';
 
 export function GET(
   _: NextRequest,
-  { params }: { params: { orgShortCode: string } }
+  { params }: { params: { orgShortcode: string } }
 ) {
-  redirect(`/${params.orgShortCode}/convo`);
+  redirect(`/${params.orgShortcode}/convo`);
 }
diff --git a/apps/web/src/app/[orgShortCode]/settings/_components/page-title.tsx b/apps/web/src/app/[orgShortcode]/settings/_components/page-title.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/_components/page-title.tsx
rename to apps/web/src/app/[orgShortcode]/settings/_components/page-title.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/_components/settings-sidebar.tsx b/apps/web/src/app/[orgShortcode]/settings/_components/settings-sidebar.tsx
similarity index 83%
rename from apps/web/src/app/[orgShortCode]/settings/_components/settings-sidebar.tsx
rename to apps/web/src/app/[orgShortcode]/settings/_components/settings-sidebar.tsx
index 706bd61d..b8fa1521 100644
--- a/apps/web/src/app/[orgShortCode]/settings/_components/settings-sidebar.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/_components/settings-sidebar.tsx
@@ -26,39 +26,39 @@ type NavLinks = {
 };
 
 export default function SettingsSidebar() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
 
   const { data: isAdmin } =
     platform.org.users.members.isOrgMemberAdmin.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   const personalLinks: NavLinks[] = [
     {
       label: 'Profile',
-      to: `/${orgShortCode}/settings/user/profile`,
+      to: `/${orgShortcode}/settings/user/profile`,
       icon: <User />
     },
     {
       label: 'Personal Addresses',
-      to: `/${orgShortCode}/settings/user/addresses`,
+      to: `/${orgShortcode}/settings/user/addresses`,
       icon: <Envelope />
     },
     {
       label: 'Security',
-      to: `/${orgShortCode}/settings/user/security`,
+      to: `/${orgShortcode}/settings/user/security`,
       icon: <Lock />
     }
   ];
   const orgSetupLinks: NavLinks[] = [
     {
       label: 'Org Profile',
-      to: `/${orgShortCode}/settings/org`,
+      to: `/${orgShortcode}/settings/org`,
       icon: <Buildings />
     },
     {
       label: 'Billing',
-      to: `/${orgShortCode}/settings/org/setup/billing`,
+      to: `/${orgShortcode}/settings/org/setup/billing`,
       icon: <CreditCard />
     }
   ];
@@ -66,29 +66,29 @@ export default function SettingsSidebar() {
   const orgUserLinks: NavLinks[] = [
     {
       label: 'Members',
-      to: `/${orgShortCode}/settings/org/users/members`,
+      to: `/${orgShortcode}/settings/org/users/members`,
       icon: <Users />
     },
     {
       label: 'Invites',
-      to: `/${orgShortCode}/settings/org/users/invites`,
+      to: `/${orgShortcode}/settings/org/users/invites`,
       icon: <UserPlus />
     },
     {
       label: 'Teams',
-      to: `/${orgShortCode}/settings/org/users/teams`,
+      to: `/${orgShortcode}/settings/org/users/teams`,
       icon: <HandHeart />
     }
   ];
   const orgMailLinks: NavLinks[] = [
     {
       label: 'Domains',
-      to: `/${orgShortCode}/settings/org/mail/domains`,
+      to: `/${orgShortcode}/settings/org/mail/domains`,
       icon: <Globe />
     },
     {
       label: 'Email Addresses',
-      to: `/${orgShortCode}/settings/org/mail/addresses`,
+      to: `/${orgShortcode}/settings/org/mail/addresses`,
       icon: <At />
     }
   ];
diff --git a/apps/web/src/app/[orgShortCode]/settings/layout.tsx b/apps/web/src/app/[orgShortcode]/settings/layout.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/layout.tsx
rename to apps/web/src/app/[orgShortcode]/settings/layout.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/[addressId]/page.tsx b/apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/[addressId]/page.tsx
similarity index 97%
rename from apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/[addressId]/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/[addressId]/page.tsx
index 7a887d20..5aa9c4e7 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/[addressId]/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/[addressId]/page.tsx
@@ -19,11 +19,11 @@ export default function Page({
 }: {
   params: { addressId: TypeId<'emailIdentities'> };
 }) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
 
   const { data: emailInfo, isLoading } =
     platform.org.mail.emailIdentities.getEmailIdentity.useQuery({
-      orgShortCode,
+      orgShortcode,
       emailIdentityPublicId: params.addressId
     });
 
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/_components/add-address-modal.tsx b/apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/_components/add-address-modal.tsx
similarity index 97%
rename from apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/_components/add-address-modal.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/_components/add-address-modal.tsx
index a0deaf9e..91006cf6 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/_components/add-address-modal.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/_components/add-address-modal.tsx
@@ -30,7 +30,7 @@ import { Separator } from '@/src/components/shadcn-ui/separator';
 import Link from 'next/link';
 
 export function AddEmailModal() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const invalidateEmails =
     platform.useUtils().org.mail.emailIdentities.getOrgEmailIdentities;
 
@@ -57,7 +57,7 @@ export function AddEmailModal() {
     onSubmit: async ({ value }) => {
       if (!value.domain) return;
       await createEmailIdentity({
-        orgShortCode,
+        orgShortcode,
         domainPublicId: value.domain,
         emailUsername: value.address,
         sendName: value.sendName,
@@ -74,16 +74,16 @@ export function AddEmailModal() {
 
   const { data: orgDomains, isLoading: orgDomainsLoading } =
     platform.org.mail.domains.getOrgDomains.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   const { data: orgMembers, isLoading: orgMembersLoading } =
     platform.org.users.members.getOrgMembers.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   const { data: orgTeams, isLoading: orgTeamsLoading } =
-    platform.org.users.teams.getOrgTeams.useQuery({ orgShortCode });
+    platform.org.users.teams.getOrgTeams.useQuery({ orgShortcode });
 
   const [open, setOpen] = useState(false);
 
@@ -315,7 +315,7 @@ export function AddEmailModal() {
                 className="flex-1"
                 asChild>
                 <Link
-                  href={`/${orgShortCode}/settings/org/mail/addresses/external`}>
+                  href={`/${orgShortcode}/settings/org/mail/addresses/external`}>
                   Add External Email Instead
                 </Link>
               </Button>
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/_components/columns.tsx b/apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/_components/columns.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/_components/columns.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/_components/columns.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/external/page.tsx b/apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/external/page.tsx
similarity index 98%
rename from apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/external/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/external/page.tsx
index 82e91241..661cb8cf 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/external/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/external/page.tsx
@@ -23,7 +23,7 @@ import Link from 'next/link';
 import { ArrowLeft } from '@phosphor-icons/react';
 
 export default function Page() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const invalidateEmails =
     platform.useUtils().org.mail.emailIdentities.getOrgEmailIdentities;
   const { mutateAsync: checkSMTPConnection } =
@@ -66,7 +66,7 @@ export default function Page() {
     validatorAdapter: zodValidator,
     onSubmit: async ({ value }) => {
       const smtpValid = await checkSMTPConnection({
-        orgShortCode,
+        orgShortcode,
         ...value.smtp
       })
         .then((e) => e.valid)
@@ -78,7 +78,7 @@ export default function Page() {
       }
 
       await createExternalEmailIdentity({
-        orgShortCode,
+        orgShortcode,
         sendName: value.sendName,
         emailAddress: value.fullEmail,
         smtp: value.smtp,
@@ -94,11 +94,11 @@ export default function Page() {
 
   const { data: orgMembers, isLoading: orgMembersLoading } =
     platform.org.users.members.getOrgMembers.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   const { data: orgTeams, isLoading: orgTeamsLoading } =
-    platform.org.users.teams.getOrgTeams.useQuery({ orgShortCode });
+    platform.org.users.teams.getOrgTeams.useQuery({ orgShortcode });
 
   return (
     <div className="flex w-full flex-col gap-2 p-4">
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/page.tsx b/apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/page.tsx
similarity index 86%
rename from apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/page.tsx
index 3534a95b..3a47d086 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/mail/addresses/page.tsx
@@ -7,10 +7,10 @@ import { columns } from './_components/columns';
 import { AddEmailModal } from './_components/add-address-modal';
 
 export default function Page() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const { data: emailsList, isLoading } =
     platform.org.mail.emailIdentities.getOrgEmailIdentities.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   return (
@@ -28,7 +28,7 @@ export default function Page() {
           columns={columns}
           data={emailsList.emailIdentityData ?? []}
           linkTo={(row) =>
-            `/${orgShortCode}/settings/org/mail/addresses/${row.publicId}`
+            `/${orgShortcode}/settings/org/mail/addresses/${row.publicId}`
           }
         />
       )}
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/[domainId]/page.tsx b/apps/web/src/app/[orgShortcode]/settings/org/mail/domains/[domainId]/page.tsx
similarity index 99%
rename from apps/web/src/app/[orgShortCode]/settings/org/mail/domains/[domainId]/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/mail/domains/[domainId]/page.tsx
index 48d194b6..dee93afe 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/[domainId]/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/mail/domains/[domainId]/page.tsx
@@ -26,14 +26,14 @@ export default function Page({
 }: {
   params: { domainId: TypeId<'domains'> };
 }) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
 
   const {
     data: domainInfo,
     isLoading,
     refetch
   } = platform.org.mail.domains.getDomain.useQuery({
-    orgShortCode,
+    orgShortcode,
     domainPublicId: params.domainId
   });
 
@@ -44,7 +44,7 @@ export default function Page({
     error: dnsError,
     isRefetching: isRecheckingDNS
   } = platform.org.mail.domains.getDomainDns.useQuery({
-    orgShortCode,
+    orgShortcode,
     domainPublicId: params.domainId
   });
 
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/_components/add-domain-modal.tsx b/apps/web/src/app/[orgShortcode]/settings/org/mail/domains/_components/add-domain-modal.tsx
similarity index 95%
rename from apps/web/src/app/[orgShortCode]/settings/org/mail/domains/_components/add-domain-modal.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/mail/domains/_components/add-domain-modal.tsx
index 19694b5d..9de666f7 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/_components/add-domain-modal.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/mail/domains/_components/add-domain-modal.tsx
@@ -17,7 +17,7 @@ import {
 import { useState } from 'react';
 
 export function AddDomainModal() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const invalidateDomains = platform.useUtils().org.mail.domains.getOrgDomains;
 
   const {
@@ -34,7 +34,7 @@ export function AddDomainModal() {
   const { data: canAddDomain, isLoading } =
     platform.org.iCanHaz.domain.useQuery(
       {
-        orgShortCode: orgShortCode
+        orgShortcode: orgShortcode
       },
       {
         staleTime: 1000
@@ -99,7 +99,7 @@ export function AddDomainModal() {
                   }
                   setInputError(null);
                   await createNewDomain({
-                    orgShortCode,
+                    orgShortcode,
                     domainName: domain
                   });
                 }}
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/_components/columns.tsx b/apps/web/src/app/[orgShortcode]/settings/org/mail/domains/_components/columns.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/org/mail/domains/_components/columns.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/mail/domains/_components/columns.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/page.tsx b/apps/web/src/app/[orgShortcode]/settings/org/mail/domains/page.tsx
similarity index 86%
rename from apps/web/src/app/[orgShortCode]/settings/org/mail/domains/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/mail/domains/page.tsx
index 56da9900..384a9574 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/mail/domains/page.tsx
@@ -7,10 +7,10 @@ import { columns } from './_components/columns';
 import { AddDomainModal } from './_components/add-domain-modal';
 
 export default function Page() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const { data: domainList, isLoading } =
     platform.org.mail.domains.getOrgDomains.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   return (
@@ -28,7 +28,7 @@ export default function Page() {
           columns={columns}
           data={domainList.domainData ?? []}
           linkTo={(row) =>
-            `/${orgShortCode}/settings/org/mail/domains/${row.publicId}`
+            `/${orgShortcode}/settings/org/mail/domains/${row.publicId}`
           }
         />
       )}
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/page.tsx b/apps/web/src/app/[orgShortcode]/settings/org/page.tsx
similarity index 93%
rename from apps/web/src/app/[orgShortCode]/settings/org/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/page.tsx
index 9764b128..d6b1a62d 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/page.tsx
@@ -16,13 +16,13 @@ import { Input } from '@/src/components/shadcn-ui/input';
 
 export default function ProfileComponent() {
   const router = useRouter();
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const currentOrg = useGlobalStore((state) => state.currentOrg);
   const updateOrg = useGlobalStore((state) => state.updateOrg);
 
   const { data: isAdmin, isLoading: adminLoading } =
     platform.org.users.members.isOrgMemberAdmin.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   const [orgNameValue, setOrgNameValue] = useState<string>(currentOrg.name);
@@ -49,7 +49,7 @@ export default function ProfileComponent() {
         publicId: currentOrg.publicId
       })
     );
-    updateOrg(orgShortCode, { avatarTimestamp });
+    updateOrg(orgShortcode, { avatarTimestamp });
   });
 
   const updateOrgProfileApi =
@@ -57,13 +57,13 @@ export default function ProfileComponent() {
   const { loading: saveLoading, run: saveOrgProfile } = useLoading(async () => {
     await updateOrgProfileApi.mutateAsync({
       orgName: orgNameValue,
-      orgShortCode
+      orgShortcode
     });
-    updateOrg(orgShortCode, { name: orgNameValue });
+    updateOrg(orgShortcode, { name: orgNameValue });
   });
 
   if (!adminLoading && !isAdmin) {
-    router.push(`/${orgShortCode}/settings`);
+    router.push(`/${orgShortcode}/settings`);
   }
 
   return (
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/setup/billing/_components/plans-table.tsx b/apps/web/src/app/[orgShortcode]/settings/org/setup/billing/_components/plans-table.tsx
similarity index 97%
rename from apps/web/src/app/[orgShortCode]/settings/org/setup/billing/_components/plans-table.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/setup/billing/_components/plans-table.tsx
index 6cf6ceb2..8255c16a 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/setup/billing/_components/plans-table.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/setup/billing/_components/plans-table.tsx
@@ -320,14 +320,14 @@ function StripeWatcher({
   onClose,
   onResolve
 }: ModalComponent<{ isYearly: boolean; plan: 'pro' }>) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const {
     data: paymentLinkInfo,
     error: linkError,
     isLoading: paymentLinkLoading
   } = platform.org.setup.billing.getOrgSubscriptionPaymentLink.useQuery(
     {
-      orgShortCode,
+      orgShortcode,
       period: isYearly ? 'yearly' : 'monthly',
       plan: plan
     },
@@ -340,9 +340,9 @@ function StripeWatcher({
     platform.useUtils().org.setup.billing.getOrgBillingOverview;
   const timeout = useRef<NodeJS.Timeout | null>(null);
   const checkPayment = useCallback(async () => {
-    const overview = await overviewApi.fetch({ orgShortCode });
+    const overview = await overviewApi.fetch({ orgShortcode });
     if (overview.currentPlan === 'pro') {
-      await overviewApi.invalidate({ orgShortCode });
+      await overviewApi.invalidate({ orgShortcode });
       if (timeout.current) {
         clearTimeout(timeout.current);
       }
@@ -353,7 +353,7 @@ function StripeWatcher({
         void checkPayment();
       }, 7500);
     }
-  }, [onResolve, orgShortCode, overviewApi]);
+  }, [onResolve, orgShortcode, overviewApi]);
 
   useEffect(() => {
     if (!open || !paymentLinkInfo) return;
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/setup/billing/page.tsx b/apps/web/src/app/[orgShortcode]/settings/org/setup/billing/page.tsx
similarity index 96%
rename from apps/web/src/app/[orgShortCode]/settings/org/setup/billing/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/setup/billing/page.tsx
index 356ce05b..caeb160c 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/setup/billing/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/setup/billing/page.tsx
@@ -12,15 +12,15 @@ import { PageTitle } from '../../../_components/page-title';
 import { Skeleton } from '@/src/components/shadcn-ui/skeleton';
 
 export default function Page() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const { data, isLoading } =
     platform.org.setup.billing.getOrgBillingOverview.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   const { data: portalLink } =
     platform.org.setup.billing.getOrgStripePortalLink.useQuery(
-      { orgShortCode },
+      { orgShortcode },
       {
         enabled: data?.currentPlan === 'pro'
       }
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/invites/_components/columns.tsx b/apps/web/src/app/[orgShortcode]/settings/org/users/invites/_components/columns.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/org/users/invites/_components/columns.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/users/invites/_components/columns.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/invites/_components/invite-modal.tsx b/apps/web/src/app/[orgShortcode]/settings/org/users/invites/_components/invite-modal.tsx
similarity index 99%
rename from apps/web/src/app/[orgShortCode]/settings/org/users/invites/_components/invite-modal.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/users/invites/_components/invite-modal.tsx
index c6deb4ae..e4ff2c12 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/users/invites/_components/invite-modal.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/users/invites/_components/invite-modal.tsx
@@ -30,7 +30,7 @@ import {
 import { useState } from 'react';
 
 export function InviteModal() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const invalidateInvites = platform.useUtils().org.users.invites.viewInvites;
 
   const { mutateAsync: createInvite, error: inviteError } =
@@ -65,7 +65,7 @@ export function InviteModal() {
     validatorAdapter: zodValidator,
     onSubmit: async ({ value }) => {
       await createInvite({
-        orgShortCode,
+        orgShortcode,
         newOrgMember: {
           firstName: value.firstName,
           lastName: value.lastName.length ? value.lastName : undefined,
@@ -91,11 +91,11 @@ export function InviteModal() {
 
   const { data: orgDomains, isLoading: orgDomainsLoading } =
     platform.org.mail.domains.getOrgDomains.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   const { data: orgTeams, isLoading: orgTeamsLoading } =
-    platform.org.users.teams.getOrgTeams.useQuery({ orgShortCode });
+    platform.org.users.teams.getOrgTeams.useQuery({ orgShortcode });
 
   const [open, setOpen] = useState(false);
 
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/invites/page.tsx b/apps/web/src/app/[orgShortcode]/settings/org/users/invites/page.tsx
similarity index 90%
rename from apps/web/src/app/[orgShortCode]/settings/org/users/invites/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/users/invites/page.tsx
index 3045e909..5eefe30f 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/users/invites/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/users/invites/page.tsx
@@ -7,10 +7,10 @@ import { columns } from './_components/columns';
 import { InviteModal } from './_components/invite-modal';
 
 export default function Page() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const { data: inviteList, isLoading } =
     platform.org.users.invites.viewInvites.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   return (
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/members/_components/columns.tsx b/apps/web/src/app/[orgShortcode]/settings/org/users/members/_components/columns.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/org/users/members/_components/columns.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/users/members/_components/columns.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/members/page.tsx b/apps/web/src/app/[orgShortcode]/settings/org/users/members/page.tsx
similarity index 86%
rename from apps/web/src/app/[orgShortCode]/settings/org/users/members/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/users/members/page.tsx
index c0280a8b..1a703aa3 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/users/members/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/users/members/page.tsx
@@ -8,10 +8,10 @@ import { Button } from '@/src/components/shadcn-ui/button';
 import Link from 'next/link';
 
 export default function Page() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const { data: memberList, isLoading } =
     platform.org.users.members.getOrgMembers.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   return (
@@ -22,7 +22,7 @@ export default function Page() {
           <div>Manage Your Org Members</div>
         </div>
         <Button asChild>
-          <Link href={`/${orgShortCode}/settings/org/users/invites`}>
+          <Link href={`/${orgShortcode}/settings/org/users/invites`}>
             Invite a Member
           </Link>
         </Button>
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/_components/add-new-member.tsx b/apps/web/src/app/[orgShortcode]/settings/org/users/teams/[teamId]/_components/add-new-member.tsx
similarity index 94%
rename from apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/_components/add-new-member.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/users/teams/[teamId]/_components/add-new-member.tsx
index dccf86c2..b6c8de6f 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/_components/add-new-member.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/users/teams/[teamId]/_components/add-new-member.tsx
@@ -19,10 +19,10 @@ type Props = {
 };
 
 export function AddNewMember({ teamId, existingMembers, complete }: Props) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const { data: allMembers, isLoading } =
     platform.org.users.members.getOrgMembers.useQuery({
-      orgShortCode
+      orgShortcode
     });
   const { mutateAsync: addNewMember, isPending: isAdding } =
     platform.org.users.teams.addOrgMemberToTeam.useMutation({
@@ -61,7 +61,7 @@ export function AddNewMember({ teamId, existingMembers, complete }: Props) {
         // loading={isAdding}
         onClick={async () => {
           await addNewMember({
-            orgShortCode,
+            orgShortcode,
             teamPublicId: teamId,
             orgMemberPublicId: selectedMember
           });
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/_components/columns.tsx b/apps/web/src/app/[orgShortcode]/settings/org/users/teams/[teamId]/_components/columns.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/_components/columns.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/users/teams/[teamId]/_components/columns.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/_components/member-editor.tsx b/apps/web/src/app/[orgShortcode]/settings/org/users/teams/[teamId]/_components/member-editor.tsx
similarity index 95%
rename from apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/_components/member-editor.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/users/teams/[teamId]/_components/member-editor.tsx
index b55d397e..39c5b052 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/_components/member-editor.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/users/teams/[teamId]/_components/member-editor.tsx
@@ -16,10 +16,10 @@ type Props = {
 };
 
 export function EditMemberList({ teamId, existingMembers, complete }: Props) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const { data: allMembers, isLoading } =
     platform.org.users.members.getOrgMembers.useQuery({
-      orgShortCode
+      orgShortcode
     });
   const { mutateAsync: saveList } =
     platform.org.users.teams.updateTeamMembers.useMutation();
@@ -70,7 +70,7 @@ export function EditMemberList({ teamId, existingMembers, complete }: Props) {
         className="w-fit"
         onClick={async () => {
           await saveList({
-            orgShortCode,
+            orgShortcode,
             teamPublicId: teamId,
             orgMemberPublicIds: selectedMembers
           });
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/page.tsx b/apps/web/src/app/[orgShortcode]/settings/org/users/teams/[teamId]/page.tsx
similarity index 97%
rename from apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/users/teams/[teamId]/page.tsx
index 64dda545..28207f86 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/users/teams/[teamId]/page.tsx
@@ -18,7 +18,7 @@ export default function Page({
 }: {
   params: { teamId: TypeId<'teams'> };
 }) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const [editMode, setEditMode] = useState(false);
 
   const {
@@ -26,7 +26,7 @@ export default function Page({
     isLoading,
     refetch
   } = platform.org.users.teams.getTeam.useQuery({
-    orgShortCode,
+    orgShortcode,
     teamPublicId: params.teamId
   });
 
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/_components/columns.tsx b/apps/web/src/app/[orgShortcode]/settings/org/users/teams/_components/columns.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/org/users/teams/_components/columns.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/users/teams/_components/columns.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/_components/new-team-modal.tsx b/apps/web/src/app/[orgShortcode]/settings/org/users/teams/_components/new-team-modal.tsx
similarity index 98%
rename from apps/web/src/app/[orgShortCode]/settings/org/users/teams/_components/new-team-modal.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/users/teams/_components/new-team-modal.tsx
index be0bed04..96ea065f 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/_components/new-team-modal.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/users/teams/_components/new-team-modal.tsx
@@ -30,7 +30,7 @@ import { useState } from 'react';
 import { type UiColor, uiColors } from '@u22n/utils/colors';
 
 export function NewTeamModal() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const invalidateTeams = platform.useUtils().org.users.teams.getOrgTeams;
 
   const utils = platform.useUtils();
@@ -41,7 +41,7 @@ export function NewTeamModal() {
 
   const { data: canAddTeam, isLoading } = platform.org.iCanHaz.team.useQuery(
     {
-      orgShortCode: orgShortCode
+      orgShortcode: orgShortcode
     },
     {
       staleTime: 1000
@@ -78,7 +78,7 @@ export function NewTeamModal() {
     onSubmit: async ({ value }) => {
       if (value.email.create) {
         const emailAvailable = await checkEmailAvailability.fetch({
-          orgShortCode,
+          orgShortcode,
           emailUsername: value.email.address,
           domainPublicId: value.email.domain
         });
@@ -89,7 +89,7 @@ export function NewTeamModal() {
       }
 
       const team = await createTeam({
-        orgShortCode,
+        orgShortcode,
         teamName: value.teamName,
         teamColor: value.color,
         teamDescription: value.description ?? undefined
@@ -97,7 +97,7 @@ export function NewTeamModal() {
 
       if (value.email.create) {
         await createEmailIdentity({
-          orgShortCode,
+          orgShortcode,
           domainPublicId: value.email.domain,
           emailUsername: value.email.address,
           sendName: value.email.sendName,
@@ -110,7 +110,7 @@ export function NewTeamModal() {
 
   const { data: orgDomains, isLoading: orgDomainsLoading } =
     platform.org.mail.domains.getOrgDomains.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   const [open, setOpen] = useState(false);
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/page.tsx b/apps/web/src/app/[orgShortcode]/settings/org/users/teams/page.tsx
similarity index 86%
rename from apps/web/src/app/[orgShortCode]/settings/org/users/teams/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/org/users/teams/page.tsx
index 621e782d..929cc6ea 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/org/users/teams/page.tsx
@@ -7,10 +7,10 @@ import { columns } from './_components/columns';
 import { NewTeamModal } from './_components/new-team-modal';
 
 export default function Page() {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const { data: teamList, isLoading } =
     platform.org.users.teams.getOrgTeams.useQuery({
-      orgShortCode
+      orgShortcode
     });
 
   return (
@@ -28,7 +28,7 @@ export default function Page() {
           columns={columns}
           data={teamList.teams ?? []}
           linkTo={(row) =>
-            `/${orgShortCode}/settings/org/users/teams/${row.publicId}`
+            `/${orgShortcode}/settings/org/users/teams/${row.publicId}`
           }
         />
       )}
diff --git a/apps/web/src/app/[orgShortCode]/settings/route.tsx b/apps/web/src/app/[orgShortcode]/settings/route.tsx
similarity index 55%
rename from apps/web/src/app/[orgShortCode]/settings/route.tsx
rename to apps/web/src/app/[orgShortcode]/settings/route.tsx
index a43a6079..527d92ff 100644
--- a/apps/web/src/app/[orgShortCode]/settings/route.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/route.tsx
@@ -3,7 +3,7 @@ import type { NextRequest } from 'next/server';
 
 export function GET(
   _: NextRequest,
-  { params }: { params: { orgShortCode: string } }
+  { params }: { params: { orgShortcode: string } }
 ) {
-  redirect(`/${params.orgShortCode}/settings/user/profile`);
+  redirect(`/${params.orgShortcode}/settings/user/profile`);
 }
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/addresses/_components/claim-address-modal.tsx b/apps/web/src/app/[orgShortcode]/settings/user/addresses/_components/claim-address-modal.tsx
similarity index 96%
rename from apps/web/src/app/[orgShortCode]/settings/user/addresses/_components/claim-address-modal.tsx
rename to apps/web/src/app/[orgShortcode]/settings/user/addresses/_components/claim-address-modal.tsx
index 7faba697..b6fea55a 100644
--- a/apps/web/src/app/[orgShortCode]/settings/user/addresses/_components/claim-address-modal.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/user/addresses/_components/claim-address-modal.tsx
@@ -19,7 +19,7 @@ export function ClaimAddressModal({
 }: ModalComponent<{ address: string }>) {
   const [isClaiming, setIsClaiming] = useState(false);
   const currentOrgName = useGlobalStore((state) => state.currentOrg.name);
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
 
   const { mutateAsync: claimAddressConfirm } =
     platform.account.addresses.claimPersonalAddress.useMutation({
@@ -82,7 +82,7 @@ export function ClaimAddressModal({
               setIsClaiming(true);
               claimAddressConfirm({
                 emailIdentity: address,
-                orgShortCode
+                orgShortcode
               })
                 .then(() => {
                   onResolve(null);
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/addresses/_components/columns.tsx b/apps/web/src/app/[orgShortcode]/settings/user/addresses/_components/columns.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/user/addresses/_components/columns.tsx
rename to apps/web/src/app/[orgShortcode]/settings/user/addresses/_components/columns.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/addresses/page.tsx b/apps/web/src/app/[orgShortcode]/settings/user/addresses/page.tsx
similarity index 97%
rename from apps/web/src/app/[orgShortCode]/settings/user/addresses/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/user/addresses/page.tsx
index 4525233c..7816bd7b 100644
--- a/apps/web/src/app/[orgShortCode]/settings/user/addresses/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/user/addresses/page.tsx
@@ -12,10 +12,10 @@ import { Button } from '@/src/components/shadcn-ui/button';
 
 export default function Page() {
   const username = useGlobalStore((state) => state.user.username);
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
 
   const { data: proStatus } = platform.org.setup.billing.isPro.useQuery({
-    orgShortCode
+    orgShortcode
   });
 
   const {
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/profile/page.tsx b/apps/web/src/app/[orgShortcode]/settings/user/profile/page.tsx
similarity index 98%
rename from apps/web/src/app/[orgShortCode]/settings/user/profile/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/user/profile/page.tsx
index d85467a4..313c2079 100644
--- a/apps/web/src/app/[orgShortCode]/settings/user/profile/page.tsx
+++ b/apps/web/src/app/[orgShortcode]/settings/user/profile/page.tsx
@@ -23,7 +23,7 @@ export default function Page() {
     isLoading: isInitDataLoading,
     refetch: revalidateProfile
   } = platform.account.profile.getOrgMemberProfile.useQuery({
-    orgShortCode: currentOrg.shortCode
+    orgShortcode: currentOrg.shortcode
   });
 
   const [avatarTimestamp, setAvatarTimestamp] = useState<Date | null>(null);
@@ -47,7 +47,7 @@ export default function Page() {
 
   useEffect(() => {
     if (initData) {
-      updateOrg(currentOrg.shortCode, { orgMemberProfile: initData.profile });
+      updateOrg(currentOrg.shortcode, { orgMemberProfile: initData.profile });
       setFirstNameValue(initData.profile.firstName ?? '');
       setLastNameValue(initData.profile.lastName ?? '');
       setTitleValue(initData.profile.title ?? '');
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/security/_components/delete-modals.tsx b/apps/web/src/app/[orgShortcode]/settings/user/security/_components/delete-modals.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/user/security/_components/delete-modals.tsx
rename to apps/web/src/app/[orgShortcode]/settings/user/security/_components/delete-modals.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/security/_components/passkey-modals.tsx b/apps/web/src/app/[orgShortcode]/settings/user/security/_components/passkey-modals.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/user/security/_components/passkey-modals.tsx
rename to apps/web/src/app/[orgShortcode]/settings/user/security/_components/passkey-modals.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/security/_components/reset-modals.tsx b/apps/web/src/app/[orgShortcode]/settings/user/security/_components/reset-modals.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/user/security/_components/reset-modals.tsx
rename to apps/web/src/app/[orgShortcode]/settings/user/security/_components/reset-modals.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/security/_components/session-modals.tsx b/apps/web/src/app/[orgShortcode]/settings/user/security/_components/session-modals.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/user/security/_components/session-modals.tsx
rename to apps/web/src/app/[orgShortcode]/settings/user/security/_components/session-modals.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/security/_components/verification-modal.tsx b/apps/web/src/app/[orgShortcode]/settings/user/security/_components/verification-modal.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/user/security/_components/verification-modal.tsx
rename to apps/web/src/app/[orgShortcode]/settings/user/security/_components/verification-modal.tsx
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/security/page.tsx b/apps/web/src/app/[orgShortcode]/settings/user/security/page.tsx
similarity index 100%
rename from apps/web/src/app/[orgShortCode]/settings/user/security/page.tsx
rename to apps/web/src/app/[orgShortcode]/settings/user/security/page.tsx
diff --git a/apps/web/src/app/join/invite/[code]/_components/invite-card.tsx b/apps/web/src/app/join/invite/[code]/_components/invite-card.tsx
index 14828a88..9293f812 100644
--- a/apps/web/src/app/join/invite/[code]/_components/invite-card.tsx
+++ b/apps/web/src/app/join/invite/[code]/_components/invite-card.tsx
@@ -121,7 +121,7 @@ export default function InviteCard({ code }: { code: string }) {
                 </Avatar>
                 <div className="flex flex-col">
                   <div className="text-xs font-bold">{inviteData.orgName}</div>
-                  <div className="text-xs">{inviteData.orgShortCode}</div>
+                  <div className="text-xs">{inviteData.orgShortcode}</div>
                 </div>
               </div>
             </div>
diff --git a/apps/web/src/app/join/org/_components/create-org.tsx b/apps/web/src/app/join/org/_components/create-org.tsx
index 1be11efe..4c62cf68 100644
--- a/apps/web/src/app/join/org/_components/create-org.tsx
+++ b/apps/web/src/app/join/org/_components/create-org.tsx
@@ -25,22 +25,22 @@ export default function CreateOrgButton({
   hasInviteCode: boolean;
 }) {
   const [orgName, setOrgName] = useState('');
-  const [orgShortCode, setOrgShortCode] = useState('');
-  const [customShortCode, setCustomShortCode] = useState(false);
+  const [orgShortcode, setOrgShortcode] = useState('');
+  const [customShortcode, setCustomShortcode] = useState(false);
   const router = useRouter();
 
-  const debouncedOrgShortCode = useDebounce(orgShortCode, 1000);
-  const checkOrgShortCodeApi =
-    platform.useUtils().org.crud.checkShortCodeAvailability;
+  const debouncedOrgShortcode = useDebounce(orgShortcode, 1000);
+  const checkOrgShortcodeApi =
+    platform.useUtils().org.crud.checkShortcodeAvailability;
   const createOrgApi = platform.org.crud.createNewOrg.useMutation();
 
   const {
-    loading: orgShortCodeDataLoading,
-    data: orgShortCodeData,
-    error: orgShortCodeError,
-    run: checkOrgShortCode
+    loading: orgShortcodeDataLoading,
+    data: orgShortcodeData,
+    error: orgShortcodeError,
+    run: checkOrgShortcode
   } = useLoading(async (signal) => {
-    if (!debouncedOrgShortCode) return;
+    if (!debouncedOrgShortcode) return;
     const parsed = z
       .string()
       .min(5)
@@ -48,7 +48,7 @@ export default function CreateOrgButton({
       .regex(/^[a-z0-9]*$/, {
         message: 'Only lowercase letters and numbers'
       })
-      .safeParse(debouncedOrgShortCode);
+      .safeParse(debouncedOrgShortcode);
 
     if (!parsed.success) {
       return {
@@ -56,8 +56,8 @@ export default function CreateOrgButton({
         available: false
       };
     }
-    return await checkOrgShortCodeApi.fetch(
-      { shortcode: debouncedOrgShortCode },
+    return await checkOrgShortcodeApi.fetch(
+      { shortcode: debouncedOrgShortcode },
       { signal }
     );
   });
@@ -67,32 +67,32 @@ export default function CreateOrgButton({
     error: createOrgError,
     run: createOrg
   } = useLoading(async () => {
-    if (!orgShortCodeData?.available) return;
+    if (!orgShortcodeData?.available) return;
     await createOrgApi.mutateAsync({
       orgName,
-      orgShortCode: debouncedOrgShortCode
+      orgShortcode: debouncedOrgShortcode
     });
     toast.success('Organization created successfully.');
-    router.push(`/join/profile?org=${debouncedOrgShortCode}`);
+    router.push(`/join/profile?org=${debouncedOrgShortcode}`);
   });
 
   useEffect(() => {
-    if (customShortCode) return;
-    setOrgShortCode(orgName?.toLowerCase().replace(/[^a-z0-9]/g, '') || '');
-  }, [orgName, customShortCode]);
+    if (customShortcode) return;
+    setOrgShortcode(orgName?.toLowerCase().replace(/[^a-z0-9]/g, '') || '');
+  }, [orgName, customShortcode]);
 
   useEffect(() => {
-    checkOrgShortCode({ clearData: true, clearError: true });
+    checkOrgShortcode({ clearData: true, clearError: true });
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [debouncedOrgShortCode]);
+  }, [debouncedOrgShortcode]);
 
   return (
     <Dialog
       onOpenChange={(open) => {
         if (!open) {
           setOrgName('');
-          setOrgShortCode('');
-          setCustomShortCode(false);
+          setOrgShortcode('');
+          setCustomShortcode(false);
         }
       }}>
       <DialogTrigger asChild>
@@ -117,22 +117,22 @@ export default function CreateOrgButton({
           <label>
             <div className="text-sm font-bold">Organization Short Code</div>
             <Input
-              value={orgShortCode}
+              value={orgShortcode}
               onChange={(e) => {
-                setOrgShortCode(e.target.value);
-                setCustomShortCode(true);
+                setOrgShortcode(e.target.value);
+                setCustomShortcode(true);
               }}
             />
           </label>
-          {!orgShortCodeData && orgShortCodeDataLoading && (
+          {!orgShortcodeData && orgShortcodeDataLoading && (
             <div className="text-muted-foreground text-sm font-bold">
               Checking...
             </div>
           )}
 
-          {orgShortCodeData && !orgShortCodeDataLoading && (
+          {orgShortcodeData && !orgShortcodeDataLoading && (
             <div className="flex items-center gap-1">
-              {orgShortCodeData.available ? (
+              {orgShortcodeData.available ? (
                 <Check
                   size={16}
                   className="text-green-10"
@@ -147,18 +147,18 @@ export default function CreateOrgButton({
               <div
                 className={cn(
                   'text-sm font-bold',
-                  orgShortCodeData.available ? 'text-green-10' : 'text-red-10'
+                  orgShortcodeData.available ? 'text-green-10' : 'text-red-10'
                 )}>
-                {orgShortCodeData.available
+                {orgShortcodeData.available
                   ? 'Looks good!'
-                  : orgShortCodeData.error}
+                  : orgShortcodeData.error}
               </div>
             </div>
           )}
 
-          {orgShortCodeError && !orgShortCodeDataLoading && (
+          {orgShortcodeError && !orgShortcodeDataLoading && (
             <div className="text-red-10 text-sm font-bold">
-              {orgShortCodeError.message}
+              {orgShortcodeError.message}
             </div>
           )}
 
@@ -169,7 +169,7 @@ export default function CreateOrgButton({
           )}
 
           <Button
-            disabled={!orgShortCodeData?.available || createOrgLoading}
+            disabled={!orgShortcodeData?.available || createOrgLoading}
             loading={createOrgLoading}
             className="mt-4"
             onClick={() => createOrg()}>
diff --git a/apps/web/src/app/join/org/_components/join-org.tsx b/apps/web/src/app/join/org/_components/join-org.tsx
index 6418eb4e..bc720d6a 100644
--- a/apps/web/src/app/join/org/_components/join-org.tsx
+++ b/apps/web/src/app/join/org/_components/join-org.tsx
@@ -56,12 +56,12 @@ export default function JoinOrgButton({
     error: joinError,
     run: joinOrg
   } = useLoading(async () => {
-    const { success, orgShortCode } = await joinOrgApi.mutateAsync({
+    const { success, orgShortcode } = await joinOrgApi.mutateAsync({
       inviteToken: inviteCode
     });
     if (success) {
       toast.success(`You have joined ${inviteData?.orgName}!`);
-      router.push(`/join/profile?org=${orgShortCode}`);
+      router.push(`/join/profile?org=${orgShortcode}`);
       setModalOpen(false);
     } else {
       throw new Error('Unknown Error Occurred');
@@ -144,7 +144,7 @@ export default function JoinOrgButton({
                     <div className="text-xs font-bold">
                       {inviteData.orgName}
                     </div>
-                    <div className="text-xs">{inviteData.orgShortCode}</div>
+                    <div className="text-xs">{inviteData.orgShortcode}</div>
                   </div>
                 </div>
               </div>
diff --git a/apps/web/src/app/join/profile/page.tsx b/apps/web/src/app/join/profile/page.tsx
index f34099a1..1d9b474f 100644
--- a/apps/web/src/app/join/profile/page.tsx
+++ b/apps/web/src/app/join/profile/page.tsx
@@ -33,7 +33,7 @@ export default function Page({
 
   const { data: orgData, isLoading: orgDataLoading } =
     platform.account.profile.getOrgMemberProfile.useQuery({
-      orgShortCode: searchParams.org
+      orgShortcode: searchParams.org
     });
 
   if (orgDataLoading) {
diff --git a/apps/web/src/components/shared/attachment-button.tsx b/apps/web/src/components/shared/attachment-button.tsx
index f2651a4c..f46066db 100644
--- a/apps/web/src/components/shared/attachment-button.tsx
+++ b/apps/web/src/components/shared/attachment-button.tsx
@@ -33,8 +33,8 @@ export function AttachmentButton({ attachmentsAtom }: AttachmentButtonProps) {
     { progress: number; fileName: string }[]
   >([]);
   const [processing, setProcessing] = useState(false);
-  const currentOrgShortCode = useGlobalStore(
-    (state) => state.currentOrg.shortCode
+  const currentOrgShortcode = useGlobalStore(
+    (state) => state.currentOrg.shortcode
   );
   const uploadedAttachmentSize = useMemo(
     () => attachments.reduce((acc, { size }) => acc + size, 0),
@@ -61,7 +61,7 @@ export function AttachmentButton({ attachmentsAtom }: AttachmentButtonProps) {
     const results = await Promise.allSettled(
       files.map(async (file) => {
         const preSignedData = (await fetch(
-          `${env.NEXT_PUBLIC_STORAGE_URL}/api/attachments/presign?orgShortCode=${currentOrgShortCode}&filename=${file.name}`,
+          `${env.NEXT_PUBLIC_STORAGE_URL}/api/attachments/presign?orgShortcode=${currentOrgShortcode}&filename=${file.name}`,
           {
             method: 'GET',
             credentials: 'include'
diff --git a/apps/web/src/components/shared/attachments.tsx b/apps/web/src/components/shared/attachments.tsx
index d118f5a2..d87030fb 100644
--- a/apps/web/src/components/shared/attachments.tsx
+++ b/apps/web/src/components/shared/attachments.tsx
@@ -49,7 +49,7 @@ export function toTrpcUploadFormat(attachments: Attachment[]) {
 }
 
 export function useAttachmentUploader(defaultList?: Attachment[]) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
   const [attachments, setAttachments] = useState(defaultList ?? []);
   const totalAttachmentSize = useMemo(
     () => attachments.reduce((acc, { size }) => acc + size, 0),
@@ -70,7 +70,7 @@ export function useAttachmentUploader(defaultList?: Attachment[]) {
     async (file: File) => {
       setPrefetching(true);
       const preSignedData = (await fetch(
-        `${env.NEXT_PUBLIC_STORAGE_URL}/api/attachments/presign?orgShortCode=${orgShortCode}&filename=${file.name}`,
+        `${env.NEXT_PUBLIC_STORAGE_URL}/api/attachments/presign?orgShortcode=${orgShortcode}&filename=${file.name}`,
         {
           method: 'GET',
           credentials: 'include'
@@ -134,7 +134,7 @@ export function useAttachmentUploader(defaultList?: Attachment[]) {
           throw new Error(`Failed to upload attachment ${file.name}`);
         });
     },
-    [orgShortCode]
+    [orgShortcode]
   );
 
   const uploadAttachments = useCallback(
diff --git a/apps/web/src/lib/middleware-utils.ts b/apps/web/src/lib/middleware-utils.ts
index 61bed399..ebb6ce30 100644
--- a/apps/web/src/lib/middleware-utils.ts
+++ b/apps/web/src/lib/middleware-utils.ts
@@ -8,11 +8,11 @@ function getBaseUrl() {
 }
 
 export async function getAuthRedirection() {
-  if (!cookies().has('unsession')) return { defaultOrgShortCode: null };
+  if (!cookies().has('unsession')) return { defaultOrgShortcode: null };
   return fetch(`${getBaseUrl()}/auth/redirection`, {
     headers: nextHeaders()
-  }).then((r) => (r.ok ? r.json() : { defaultOrgShortCode: null })) as Promise<{
-    defaultOrgShortCode: string | null;
+  }).then((r) => (r.ok ? r.json() : { defaultOrgShortcode: null })) as Promise<{
+    defaultOrgShortcode: string | null;
   }>;
 }
 
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index c089cfb0..de169c01 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -20,7 +20,7 @@ export default async function middleware(req: NextRequest) {
       const redirectData = await getAuthRedirection().catch(() => null);
       if (redirectData) {
         return NextResponse.redirect(
-          new URL(redirectData.defaultOrgShortCode ?? '/join/org', req.nextUrl)
+          new URL(redirectData.defaultOrgShortcode ?? '/join/org', req.nextUrl)
         );
       }
     } else {
diff --git a/apps/web/src/providers/realtime-provider.tsx b/apps/web/src/providers/realtime-provider.tsx
index 0f82533d..9889cf8b 100644
--- a/apps/web/src/providers/realtime-provider.tsx
+++ b/apps/web/src/providers/realtime-provider.tsx
@@ -13,7 +13,7 @@ import { env } from '../env';
 const realtimeContext = createContext<RealtimeClient | null>(null);
 
 export function RealtimeProvider({ children }: PropsWithChildren) {
-  const orgShortCode = useGlobalStore((state) => state.currentOrg.shortCode);
+  const orgShortcode = useGlobalStore((state) => state.currentOrg.shortcode);
 
   const [client] = useState(
     () =>
@@ -26,7 +26,7 @@ export function RealtimeProvider({ children }: PropsWithChildren) {
   );
 
   useEffect(() => {
-    void client.connect({ orgShortCode }).catch(() => {
+    void client.connect({ orgShortcode }).catch(() => {
       toast.error(
         'UnInbox encountered an error while trying to connect to the realtime server'
       );
@@ -34,7 +34,7 @@ export function RealtimeProvider({ children }: PropsWithChildren) {
     return () => {
       client.disconnect();
     };
-  }, [client, orgShortCode]);
+  }, [client, orgShortcode]);
 
   return (
     <realtimeContext.Provider value={client}>
diff --git a/apps/web/src/stores/global-store.ts b/apps/web/src/stores/global-store.ts
index ecb4982b..ada69ad0 100644
--- a/apps/web/src/stores/global-store.ts
+++ b/apps/web/src/stores/global-store.ts
@@ -2,7 +2,7 @@ import { type TypeId } from '@u22n/utils/typeid';
 import { createStore } from 'zustand/vanilla';
 
 type Org = {
-  shortCode: string;
+  shortcode: string;
   name: string;
   publicId: TypeId<'org'>;
   avatarTimestamp: Date | null;
@@ -28,9 +28,9 @@ export type GlobalStoreState = {
 };
 
 export type GlobalStoreActions = {
-  setCurrentOrg: (shortCode: string) => void;
+  setCurrentOrg: (shortcode: string) => void;
   addOrg: (...orgs: Org[]) => void;
-  updateOrg: (shortCode: string, data: Partial<Org>) => void;
+  updateOrg: (shortcode: string, data: Partial<Org>) => void;
 };
 
 export type GlobalStore = GlobalStoreState & GlobalStoreActions;
@@ -38,19 +38,19 @@ export type GlobalStore = GlobalStoreState & GlobalStoreActions;
 export const createGlobalStore = (initState: GlobalStoreState) =>
   createStore<GlobalStore>()((set) => ({
     ...initState,
-    setCurrentOrg: (shortCode: string) =>
+    setCurrentOrg: (shortcode: string) =>
       set((state) => ({
-        currentOrg: state.orgs.find((org) => org.shortCode === shortCode)
+        currentOrg: state.orgs.find((org) => org.shortcode === shortcode)
       })),
     addOrg: (...orgs: Org[]) =>
       set((state) => ({ orgs: state.orgs.concat(orgs) })),
-    updateOrg: (shortCode: string, data: Partial<Org>) =>
+    updateOrg: (shortcode: string, data: Partial<Org>) =>
       set((state) => ({
         orgs: state.orgs.map((org) =>
-          org.shortCode === shortCode ? { ...org, ...data } : org
+          org.shortcode === shortcode ? { ...org, ...data } : org
         ),
         currentOrg:
-          state.currentOrg.shortCode === shortCode
+          state.currentOrg.shortcode === shortcode
             ? { ...state.currentOrg, ...data }
             : state.currentOrg
       }))
diff --git a/ee/apps/command/src/app/skiff/page.tsx b/ee/apps/command/src/app/skiff/page.tsx
index 3c4d9db9..bd30e1b4 100644
--- a/ee/apps/command/src/app/skiff/page.tsx
+++ b/ee/apps/command/src/app/skiff/page.tsx
@@ -7,9 +7,9 @@ import { useState } from 'react';
 import { toast } from 'sonner';
 
 export default function Page() {
-  const [orgShortCode, setOrgShortCode] = useState<string>('');
+  const [orgShortcode, setOrgShortcode] = useState<string>('');
   const { data, error, isLoading, refetch } = api.orgs.getOrgData.useQuery(
-    { orgShortCode },
+    { orgShortcode },
     { enabled: false }
   );
   const { isPending, mutateAsync } = api.orgs.addSkiffOffer.useMutation({
@@ -27,8 +27,8 @@ export default function Page() {
       <h1 className="text-2xl font-bold">Skiff Offer</h1>
       <div className="flex w-fit gap-2">
         <Input
-          value={orgShortCode}
-          onChange={(e) => setOrgShortCode(e.target.value)}
+          value={orgShortcode}
+          onChange={(e) => setOrgShortcode(e.target.value)}
           placeholder="Enter Org Shortcode"
         />
         <Button
diff --git a/ee/apps/command/src/server/trpc/routers/orgRoutes.ts b/ee/apps/command/src/server/trpc/routers/orgRoutes.ts
index fdaf88f4..3685bc6b 100644
--- a/ee/apps/command/src/server/trpc/routers/orgRoutes.ts
+++ b/ee/apps/command/src/server/trpc/routers/orgRoutes.ts
@@ -10,14 +10,14 @@ export const orgRouter = router({
   getOrgData: accountProcedure
     .input(
       z.object({
-        orgShortCode: z.string(),
+        orgShortcode: z.string(),
         orgPublicId: typeIdValidator('org').optional()
       })
     )
     .query(async ({ input }) => {
       //const { config, db } = ctx;
 
-      if (!input.orgShortCode) {
+      if (!input.orgShortcode) {
         throw new TRPCError({
           code: 'BAD_REQUEST',
           message: 'must provide either org shortcode or public id'
@@ -25,7 +25,7 @@ export const orgRouter = router({
       }
 
       const orgDataQuery = await db.query.orgs.findFirst({
-        where: eq(orgs.shortcode, input.orgShortCode),
+        where: eq(orgs.shortcode, input.orgShortcode),
         columns: {
           id: true,
           publicId: true,
diff --git a/packages/realtime/client.ts b/packages/realtime/client.ts
index 07e5e239..2094d919 100644
--- a/packages/realtime/client.ts
+++ b/packages/realtime/client.ts
@@ -17,7 +17,7 @@ export default class RealtimeClient {
     }
   ) {}
 
-  public async connect({ orgShortCode }: { orgShortCode: string }) {
+  public async connect({ orgShortcode }: { orgShortcode: string }) {
     if (this.client) return;
     const client = new Pusher(this.config.appKey, {
       wsHost: this.config.host,
@@ -32,7 +32,7 @@ export default class RealtimeClient {
             method: 'POST',
             credentials: 'include',
             headers: {
-              'org-shortcode': orgShortCode,
+              'org-shortcode': orgShortcode,
               'Content-Type': 'application/json'
             }
           });