diff --git a/app/components/task/holder.hbs b/app/components/task/holder.hbs
index b6b38809..60695447 100644
--- a/app/components/task/holder.hbs
+++ b/app/components/task/holder.hbs
@@ -42,6 +42,7 @@
           {{#each this.availabletaskStatusList as |taskStatus|}}
             {{#if (not-eq taskStatus.key this.TASK_KEYS.ALL)}}
               <option
+                data-test-dropdown-option={{taskStatus.displayLabel}}
                 value={{taskStatus.key}}
                 selected={{eq taskStatus.key this.status}}
               >
diff --git a/app/components/task/holder.js b/app/components/task/holder.js
index 4e058848..47672f7b 100644
--- a/app/components/task/holder.js
+++ b/app/components/task/holder.js
@@ -16,7 +16,7 @@ export default class TasksHolderComponent extends Component {
 
   get taskStyleClass() {
     const statusNotOverDueList = [
-      TASK_KEYS.COMPLETED,
+      TASK_KEYS.DONE,
       TASK_KEYS.VERIFIED,
       TASK_KEYS.AVAILABLE,
     ];
diff --git a/app/constants/tasks.js b/app/constants/tasks.js
index 3947ee71..27ad7102 100644
--- a/app/constants/tasks.js
+++ b/app/constants/tasks.js
@@ -5,7 +5,7 @@ const TASK_KEYS = {
   IN_PROGRESS: 'IN_PROGRESS',
   BLOCKED: 'BLOCKED',
   SMOKE_TESTING: 'SMOKE_TESTING',
-  COMPLETED: 'COMPLETED',
+  DONE: 'DONE',
   NEEDS_REVIEW: 'NEEDS_REVIEW',
   IN_REVIEW: 'IN_REVIEW',
   APPROVED: 'APPROVED',
@@ -23,7 +23,7 @@ const {
   IN_PROGRESS,
   BLOCKED,
   SMOKE_TESTING,
-  COMPLETED,
+  DONE,
   NEEDS_REVIEW,
   IN_REVIEW,
   APPROVED,
@@ -60,8 +60,8 @@ const TASK_STATUS_LIST = [
     key: SMOKE_TESTING,
   },
   {
-    displayLabel: 'Completed',
-    key: COMPLETED,
+    displayLabel: 'Done',
+    key: DONE,
   },
   {
     displayLabel: 'Needs Review',
@@ -133,7 +133,7 @@ const TABS_TASK_STATUS_LIST = [
 ];
 export const TASK_MESSAGES = {
   MARK_DONE:
-    'This task will be marked as complete and a new task will be assigned to you',
+    'This task will be marked as done and a new task will be assigned to you',
   UPDATE_TASK: 'Updating task',
   FIND_TASK: 'Finding new task for you!',
 };
diff --git a/app/controllers/tasks.js b/app/controllers/tasks.js
index 917d448a..94333d56 100644
--- a/app/controllers/tasks.js
+++ b/app/controllers/tasks.js
@@ -93,7 +93,7 @@ export default class TasksController extends Controller {
     const taskCompletionPercentage = object.percentCompleted;
     if (taskCompletionPercentage) {
       if (taskCompletionPercentage === TASK_PERCENTAGE.completedPercentage) {
-        requestBody.status = 'COMPLETED';
+        requestBody.status = 'DONE';
       }
       requestBody.percentCompleted = parseInt(taskCompletionPercentage);
     }