diff --git a/dashboard/app/(tenant)/[slug]/mail/compose/page.tsx b/dashboard/app/(tenant)/[tenantId]/mail/compose/page.tsx
similarity index 67%
rename from dashboard/app/(tenant)/[slug]/mail/compose/page.tsx
rename to dashboard/app/(tenant)/[tenantId]/mail/compose/page.tsx
index da125bd..7461445 100644
--- a/dashboard/app/(tenant)/[slug]/mail/compose/page.tsx
+++ b/dashboard/app/(tenant)/[tenantId]/mail/compose/page.tsx
@@ -4,11 +4,11 @@ import ComposeForm from '../../../../components/mail/ComposeForm'
 
 type PageProps = {
   params: Promise<{
-    slug: string
+    tenantId: string
   }>
 }
 
 export default async function ComposePage({ params }: PageProps) {
-  const { slug } = await params
-  return <ComposeForm tenantId={slug} />
+  const { tenantId } = await params
+  return <ComposeForm tenantId={tenantId} />
 }
diff --git a/dashboard/app/(tenant)/[slug]/mail/message/[id]/page.tsx b/dashboard/app/(tenant)/[tenantId]/mail/message/[id]/page.tsx
similarity index 84%
rename from dashboard/app/(tenant)/[slug]/mail/message/[id]/page.tsx
rename to dashboard/app/(tenant)/[tenantId]/mail/message/[id]/page.tsx
index dc2975b..e26e02a 100644
--- a/dashboard/app/(tenant)/[slug]/mail/message/[id]/page.tsx
+++ b/dashboard/app/(tenant)/[tenantId]/mail/message/[id]/page.tsx
@@ -4,12 +4,12 @@ import { useRouter } from 'next/navigation'
 
 import MessageView from '../../../../../components/mail/MessageView'
 
-export default function MessageDetailPage({ params }: { params: { slug: string; id: string } }) {
+export default function MessageDetailPage({ params }: { params: { tenantId: string; id: string } }) {
   const router = useRouter()
   return (
     <div className="flex flex-col gap-4">
       <MessageView
-        tenantId={params.slug}
+        tenantId={params.tenantId}
         messageId={params.id}
         showBackButton
         onBack={() => router.back()}
diff --git a/dashboard/app/(tenant)/[slug]/mail/page.tsx b/dashboard/app/(tenant)/[tenantId]/mail/page.tsx
similarity index 63%
rename from dashboard/app/(tenant)/[slug]/mail/page.tsx
rename to dashboard/app/(tenant)/[tenantId]/mail/page.tsx
index e00a4c7..00509f2 100644
--- a/dashboard/app/(tenant)/[slug]/mail/page.tsx
+++ b/dashboard/app/(tenant)/[tenantId]/mail/page.tsx
@@ -4,11 +4,11 @@ import MailDashboard from '../../../components/mail/MailDashboard'
 
 type PageProps = {
   params: Promise<{
-    slug: string
+    tenantId: string
   }>
 }
 
 export default async function TenantMailPage({ params }: PageProps) {
-  const { slug } = await params
-  return <MailDashboard tenantId={slug} tenantName={slug} />
+  const { tenantId } = await params
+  return <MailDashboard tenantId={tenantId} tenantName={tenantId} />
 }
diff --git a/dashboard/app/(tenant)/[slug]/mail/settings/page.tsx b/dashboard/app/(tenant)/[tenantId]/mail/settings/page.tsx
similarity index 68%
rename from dashboard/app/(tenant)/[slug]/mail/settings/page.tsx
rename to dashboard/app/(tenant)/[tenantId]/mail/settings/page.tsx
index aec2671..ab88b71 100644
--- a/dashboard/app/(tenant)/[slug]/mail/settings/page.tsx
+++ b/dashboard/app/(tenant)/[tenantId]/mail/settings/page.tsx
@@ -4,11 +4,11 @@ import MailSettings from '../../../../components/mail/MailSettings'
 
 type PageProps = {
   params: Promise<{
-    slug: string
+    tenantId: string
   }>
 }
 
 export default async function MailSettingsPage({ params }: PageProps) {
-  const { slug } = await params
-  return <MailSettings tenantId={slug} />
+  const { tenantId } = await params
+  return <MailSettings tenantId={tenantId} />
 }