diff --git a/project_workload/models/project_task.py b/project_workload/models/project_task.py
index 2056fbfd..ffc47481 100644
--- a/project_workload/models/project_task.py
+++ b/project_workload/models/project_task.py
@@ -25,8 +25,8 @@ class ProjectTask(models.Model):
     config_workload_manually = fields.Boolean()
 
     @api.depends(
-        "date_start",
-        "date_end",
+        "planned_date_start",
+        "planned_date_end",
         "planned_hours",
         "user_ids",
         "config_workload_manually",
@@ -39,15 +39,17 @@ def _compute_workload_ids(self):
 
             # Handle only automatic config in planned task
             if record.config_workload_manually or not (
-                record.date_start and record.date_end and record.planned_hours
+                record.planned_date_start
+                and record.planned_date_end
+                and record.planned_hours
             ):
                 continue
             record.workload_ids = record._get_workload_sync()
 
     def _prepare_workload(self, user, **extra):
         return {
-            "date_start": self.date_start,
-            "date_end": self.date_end,
+            "date_start": self.planned_date_start,
+            "date_end": self.planned_date_end,
             "hours": self.planned_hours,
             "user_id": user.id,
             **extra,
diff --git a/project_workload/models/project_task_workload.py b/project_workload/models/project_task_workload.py
index d7ae440b..71dc72e8 100644
--- a/project_workload/models/project_task_workload.py
+++ b/project_workload/models/project_task_workload.py
@@ -42,8 +42,8 @@ class ProjectTaskWorkload(models.Model):
 
     @api.constrains("date_start", "date_end")
     def _check_end_date(self):
-        for task in self:
-            if task.date_end < task.date_start:
+        for load in self:
+            if load.date_end < load.date_start:
                 raise ValidationError(
                     _("The end date cannot be earlier than the start date.")
                 )
diff --git a/project_workload/tests/test_workload.py b/project_workload/tests/test_workload.py
index 40958281..7eaae9f5 100644
--- a/project_workload/tests/test_workload.py
+++ b/project_workload/tests/test_workload.py
@@ -16,8 +16,8 @@ def _create_task(self):
                 "name": "Task 1",
                 "project_id": self.project.id,
                 "user_ids": [(4, self.user_1.id)],
-                "date_start": now,
-                "date_end": now + timedelta(days=20),
+                "planned_date_start": now,
+                "planned_date_end": now + timedelta(days=20),
                 "planned_hours": 21,
             }
         )
@@ -26,8 +26,8 @@ def test_task_assign_with_hours(self):
         self._create_task()
         workload = self.task.workload_ids
         self.assertEqual(len(workload), 1)
-        self.assertEqual(workload.date_start, self.task.date_start.date())
-        self.assertEqual(workload.date_end, self.task.date_end.date())
+        self.assertEqual(workload.date_start, self.task.planned_date_start.date())
+        self.assertEqual(workload.date_end, self.task.planned_date_end.date())
         self.assertEqual(workload.hours, 21)
         load_unit = workload.unit_ids
         self.assertEqual(len(load_unit), 3)
@@ -53,11 +53,11 @@ def test_add_user(self):
 
     def test_change_date(self):
         self._create_task()
-        self.task.date_end = self.task.date_start + timedelta(days=13)
+        self.task.planned_date_end = self.task.planned_date_start + timedelta(days=13)
         workload = self.task.workload_ids
         self.assertEqual(len(workload), 1)
-        self.assertEqual(workload.date_start, self.task.date_start.date())
-        self.assertEqual(workload.date_end, self.task.date_end.date())
+        self.assertEqual(workload.date_start, self.task.planned_date_start.date())
+        self.assertEqual(workload.date_end, self.task.planned_date_end.date())
         self.assertEqual(workload.hours, 21)
         load_unit = workload.unit_ids
         self.assertEqual(len(load_unit), 2)