diff --git a/app/(dashboard)/api-test/page.tsx b/app/(dashboard)/api-test/page.tsx
index 4b5386a..5deffc1 100644
--- a/app/(dashboard)/api-test/page.tsx
+++ b/app/(dashboard)/api-test/page.tsx
@@ -61,7 +61,7 @@ export default function ApiTestPage() {
           <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
             {epics.map((epic) => (
               <Card key={epic.id} className="p-4">
-                <h3 className="font-semibold">{epic.title}</h3>
+                <h3 className="font-semibold">{epic.name}</h3>
                 {epic.description && (
                   <p className="text-sm text-gray-600 mt-1">{epic.description}</p>
                 )}
diff --git a/app/(dashboard)/projects/[id]/epics/page.tsx b/app/(dashboard)/projects/[id]/epics/page.tsx
index d8947a2..a510848 100644
--- a/app/(dashboard)/projects/[id]/epics/page.tsx
+++ b/app/(dashboard)/projects/[id]/epics/page.tsx
@@ -207,7 +207,7 @@ export default function EpicsPage({ params }: EpicsPageProps) {
                       className="block hover:underline"
                     >
                       <CardTitle className="line-clamp-2 text-lg">
-                        {epic.title}
+                        {epic.name}
                       </CardTitle>
                     </Link>
                     <div className="flex items-center gap-2 flex-wrap">
diff --git a/app/(dashboard)/projects/[id]/page.tsx b/app/(dashboard)/projects/[id]/page.tsx
index d19a5a8..36faccc 100644
--- a/app/(dashboard)/projects/[id]/page.tsx
+++ b/app/(dashboard)/projects/[id]/page.tsx
@@ -239,7 +239,7 @@ export default function ProjectDetailPage({ params }: ProjectDetailPageProps) {
                     >
                       <div className="flex items-start justify-between">
                         <div className="space-y-1 flex-1">
-                          <p className="text-sm font-medium line-clamp-1">{epic.title}</p>
+                          <p className="text-sm font-medium line-clamp-1">{epic.name}</p>
                           <div className="flex items-center gap-2">
                             <Badge variant="outline" className="text-xs">
                               {epic.status}
diff --git a/components/epics/epic-form.tsx b/components/epics/epic-form.tsx
index 6abd1bb..d3e858d 100644
--- a/components/epics/epic-form.tsx
+++ b/components/epics/epic-form.tsx
@@ -26,9 +26,10 @@ import { useCreateEpic, useUpdateEpic } from '@/lib/hooks/use-epics';
 import type { Epic, WorkItemPriority } from '@/types/project';
 import { toast } from 'sonner';
 import { Loader2 } from 'lucide-react';
+import { useAuthStore } from '@/stores/authStore';
 
 const epicSchema = z.object({
-  title: z
+  name: z
     .string()
     .min(1, 'Title is required')
     .max(200, 'Title must be less than 200 characters'),
@@ -57,11 +58,12 @@ export function EpicForm({ projectId, epic, onSuccess, onCancel }: EpicFormProps
   const isEditing = !!epic;
   const createEpic = useCreateEpic();
   const updateEpic = useUpdateEpic();
+  const user = useAuthStore((state) => state.user);
 
   const form = useForm<EpicFormValues>({
     resolver: zodResolver(epicSchema),
     defaultValues: {
-      title: epic?.title || '',
+      name: epic?.name || '',  // Fixed: use 'name' instead of 'title'
       description: epic?.description || '',
       priority: epic?.priority || 'Medium',
       estimatedHours: epic?.estimatedHours || ('' as any),
@@ -70,6 +72,11 @@ export function EpicForm({ projectId, epic, onSuccess, onCancel }: EpicFormProps
 
   async function onSubmit(data: EpicFormValues) {
     try {
+      if (!user?.id) {
+        toast.error('User not authenticated');
+        return;
+      }
+
       const payload = {
         ...data,
         estimatedHours: data.estimatedHours || undefined,
@@ -83,6 +90,7 @@ export function EpicForm({ projectId, epic, onSuccess, onCancel }: EpicFormProps
       } else {
         await createEpic.mutateAsync({
           projectId,
+          createdBy: user.id,
           ...payload,
         });
       }
@@ -107,7 +115,7 @@ export function EpicForm({ projectId, epic, onSuccess, onCancel }: EpicFormProps
       <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
         <FormField
           control={form.control}
-          name="title"
+          name="name"
           render={({ field }) => (
             <FormItem>
               <FormLabel>Epic Title *</FormLabel>
diff --git a/components/projects/hierarchy-tree.tsx b/components/projects/hierarchy-tree.tsx
index 0d5d78b..8914760 100644
--- a/components/projects/hierarchy-tree.tsx
+++ b/components/projects/hierarchy-tree.tsx
@@ -102,7 +102,7 @@ function EpicNode({ epic, onEpicClick, onStoryClick, onTaskClick }: EpicNodeProp
                 onEpicClick?.(epic);
               }}
             >
-              {epic.title}
+              {epic.name}
             </span>
             <StatusBadge status={epic.status} />
             <PriorityBadge priority={epic.priority} />
diff --git a/components/projects/story-form.tsx b/components/projects/story-form.tsx
index b2bd0f5..837600a 100644
--- a/components/projects/story-form.tsx
+++ b/components/projects/story-form.tsx
@@ -144,7 +144,7 @@ export function StoryForm({
                   ) : (
                     epics.map((epic) => (
                       <SelectItem key={epic.id} value={epic.id}>
-                        {epic.title}
+                        {epic.name}
                       </SelectItem>
                     ))
                   )}
diff --git a/types/project.ts b/types/project.ts
index cba37ce..a1bde95 100644
--- a/types/project.ts
+++ b/types/project.ts
@@ -28,7 +28,7 @@ export interface UpdateProjectDto {
 // ==================== Epic ====================
 export interface Epic {
   id: string;
-  title: string;
+  name: string;  // Changed from 'title' to match backend API
   description?: string;
   projectId: string;
   status: WorkItemStatus;
@@ -36,6 +36,7 @@ export interface Epic {
   estimatedHours?: number;
   actualHours?: number;
   assigneeId?: string;
+  createdBy: string;  // Added to match backend API (required field)
   tenantId: string;
   createdAt: string;
   updatedAt: string;
@@ -43,14 +44,15 @@ export interface Epic {
 
 export interface CreateEpicDto {
   projectId: string;
-  title: string;
+  name: string;  // Changed from 'title' to match backend API
   description?: string;
   priority: WorkItemPriority;
   estimatedHours?: number;
+  createdBy: string;  // Added to match backend API (required field)
 }
 
 export interface UpdateEpicDto {
-  title?: string;
+  name?: string;  // Changed from 'title' to match backend API
   description?: string;
   priority?: WorkItemPriority;
   estimatedHours?: number;