diff --git a/go/quickstep/src/com/android/quickstep/TaskInputController.java b/go/quickstep/src/com/android/quickstep/TaskActionController.java
similarity index 74%
rename from go/quickstep/src/com/android/quickstep/TaskInputController.java
rename to go/quickstep/src/com/android/quickstep/TaskActionController.java
index 10de5c8..b2d495b 100644
--- a/go/quickstep/src/com/android/quickstep/TaskInputController.java
+++ b/go/quickstep/src/com/android/quickstep/TaskActionController.java
@@ -23,24 +23,25 @@
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 
 /**
- * Controller responsible for task logic that occurs on various input to the recents view.
+ * Controller that provides logic for task-related commands on recents and updating the model/view
+ * as appropriate.
  */
-public final class TaskInputController {
+public final class TaskActionController {
 
     private final TaskListLoader mLoader;
     private final TaskAdapter mAdapter;
 
-    public TaskInputController(TaskListLoader loader,TaskAdapter adapter) {
+    public TaskActionController(TaskListLoader loader, TaskAdapter adapter) {
         mLoader = loader;
         mAdapter = adapter;
     }
 
     /**
-     * Logic that occurs when a task view is tapped. Launches the respective task.
+     * Launch the task associated with the task holder, animating into the app.
      *
-     * @param viewHolder the task view holder that has been tapped
+     * @param viewHolder the task view holder to launch
      */
-    public void onTaskClicked(TaskHolder viewHolder) {
+    public void launchTask(TaskHolder viewHolder) {
         TaskItemView itemView = (TaskItemView) (viewHolder.itemView);
         View v = itemView.getThumbnailView();
         int left = 0;
@@ -53,7 +54,12 @@
                 opts, null /* resultCallback */, null /* resultCallbackHandler */);
     }
 
-    public void onTaskSwiped(TaskHolder viewHolder) {
+    /**
+     * Removes the task holder and the task, updating the model and the view.
+     *
+     * @param viewHolder the task view holder to remove
+     */
+    public void removeTask(TaskHolder viewHolder) {
         int position = viewHolder.getAdapterPosition();
         Task task = viewHolder.getTask();
         ActivityManagerWrapper.getInstance().removeTask(task.key.id);
@@ -62,9 +68,9 @@
     }
 
     /**
-     * Logic that occurs when clear all is triggered.
+     * Clears all tasks and updates the model and view.
      */
-    public void onClearAllClicked(View view) {
+    public void clearAllTasks() {
         // TODO: Play an animation so transition is more natural.
         int count = mAdapter.getItemCount();
         ActivityManagerWrapper.getInstance().removeAllRecentTasks();
diff --git a/go/quickstep/src/com/android/quickstep/TaskAdapter.java b/go/quickstep/src/com/android/quickstep/TaskAdapter.java
index 9a2c0f8..e56cc51 100644
--- a/go/quickstep/src/com/android/quickstep/TaskAdapter.java
+++ b/go/quickstep/src/com/android/quickstep/TaskAdapter.java
@@ -39,14 +39,14 @@
     private static final String TAG = "TaskAdapter";
     private final TaskListLoader mLoader;
     private final ArrayMap<Integer, TaskItemView> mTaskIdToViewMap = new ArrayMap<>();
-    private TaskInputController mInputController;
+    private TaskActionController mTaskActionController;
 
     public TaskAdapter(@NonNull TaskListLoader loader) {
         mLoader = loader;
     }
 
-    public void setInputController(TaskInputController inputController) {
-        mInputController = inputController;
+    public void setActionController(TaskActionController taskActionController) {
+        mTaskActionController = taskActionController;
     }
 
     /**
@@ -64,7 +64,7 @@
         TaskItemView itemView = (TaskItemView) LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.task_item_view, parent, false);
         TaskHolder holder = new TaskHolder(itemView);
-        itemView.setOnClickListener(view -> mInputController.onTaskClicked(holder));
+        itemView.setOnClickListener(view -> mTaskActionController.launchTask(holder));
         return holder;
     }
 
diff --git a/go/quickstep/src/com/android/quickstep/TaskSwipeCallback.java b/go/quickstep/src/com/android/quickstep/TaskSwipeCallback.java
index 2a53917..98407d8 100644
--- a/go/quickstep/src/com/android/quickstep/TaskSwipeCallback.java
+++ b/go/quickstep/src/com/android/quickstep/TaskSwipeCallback.java
@@ -26,11 +26,11 @@
  */
 public final class TaskSwipeCallback extends ItemTouchHelper.SimpleCallback {
 
-    private final TaskInputController mTaskInputController;
+    private final TaskActionController mTaskActionController;
 
-    public TaskSwipeCallback(TaskInputController inputController) {
+    public TaskSwipeCallback(TaskActionController taskActionController) {
         super(0 /* dragDirs */, RIGHT);
-        mTaskInputController = inputController;
+        mTaskActionController = taskActionController;
     }
 
     @Override
@@ -42,7 +42,7 @@
     @Override
     public void onSwiped(ViewHolder viewHolder, int direction) {
         if (direction == RIGHT) {
-            mTaskInputController.onTaskSwiped((TaskHolder) viewHolder);
+            mTaskActionController.removeTask((TaskHolder) viewHolder);
         }
     }
 }
diff --git a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java b/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
index 94f3e66..0e5dbc4 100644
--- a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
+++ b/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
@@ -36,7 +36,7 @@
 import com.android.launcher3.R;
 import com.android.quickstep.RecentsToActivityHelper;
 import com.android.quickstep.TaskAdapter;
-import com.android.quickstep.TaskInputController;
+import com.android.quickstep.TaskActionController;
 import com.android.quickstep.TaskListLoader;
 import com.android.quickstep.TaskSwipeCallback;
 
@@ -74,7 +74,7 @@
     private final Context mContext;
     private final TaskListLoader mTaskLoader;
     private final TaskAdapter mTaskAdapter;
-    private final TaskInputController mTaskInputController;
+    private final TaskActionController mTaskActionController;
 
     private RecentsToActivityHelper mActivityHelper;
     private RecyclerView mTaskRecyclerView;
@@ -86,8 +86,8 @@
         mContext = context;
         mTaskLoader = new TaskListLoader(mContext);
         mTaskAdapter = new TaskAdapter(mTaskLoader);
-        mTaskInputController = new TaskInputController(mTaskLoader, mTaskAdapter);
-        mTaskAdapter.setInputController(mTaskInputController);
+        mTaskActionController = new TaskActionController(mTaskLoader, mTaskAdapter);
+        mTaskAdapter.setActionController(mTaskActionController);
     }
 
     @Override
@@ -99,7 +99,7 @@
             mTaskRecyclerView.setLayoutManager(
                     new LinearLayoutManager(mContext, VERTICAL, true /* reverseLayout */));
             ItemTouchHelper helper = new ItemTouchHelper(
-                    new TaskSwipeCallback(mTaskInputController));
+                    new TaskSwipeCallback(mTaskActionController));
             helper.attachToRecyclerView(mTaskRecyclerView);
 
             mEmptyView = findViewById(R.id.recent_task_empty_view);
@@ -117,7 +117,7 @@
             });
 
             View clearAllView = findViewById(R.id.clear_all_button);
-            clearAllView.setOnClickListener(mTaskInputController::onClearAllClicked);
+            clearAllView.setOnClickListener(v -> mTaskActionController.clearAllTasks());
         }
     }