diff --git a/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt b/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt
index 0b384c167..12a1a5e5e 100644
--- a/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt
+++ b/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt
@@ -78,10 +78,10 @@ class DragAndDropRecyclerAdapter(
             super.onSelectedChanged(viewHolder, actionState)
             if (actionState == ItemTouchHelper.ACTION_STATE_DRAG) {
                 taskList.startActionMode()
-                (viewHolder as ViewHolder?)!!.isMoving = true
+                (viewHolder as TaskViewHolder?)!!.isMoving = true
                 dragging = true
                 val position = viewHolder!!.adapterPosition
-                updateIndents(viewHolder as ViewHolder?, position, position)
+                updateIndents(viewHolder as TaskViewHolder?, position, position)
             }
         }
 
@@ -98,8 +98,8 @@ class DragAndDropRecyclerAdapter(
             taskList.finishActionMode()
             val fromPosition = src.adapterPosition
             val toPosition = target.adapterPosition
-            val source = src as ViewHolder
-            if (!adapter.canMove(source.task, fromPosition, (target as ViewHolder).task, toPosition)) {
+            val source = src as TaskViewHolder
+            if (!adapter.canMove(source.task, fromPosition, (target as TaskViewHolder).task, toPosition)) {
                 return false
             }
             if (from == -1) {
@@ -112,7 +112,7 @@ class DragAndDropRecyclerAdapter(
             return true
         }
 
-        private fun updateIndents(source: ViewHolder?, from: Int, to: Int) {
+        private fun updateIndents(source: TaskViewHolder?, from: Int, to: Int) {
             val task = source!!.task
             source.minIndent = if (to == 0 || to == itemCount - 1) 0 else adapter.minIndent(if (from <= to) to + 1 else to, task)
             source.maxIndent = if (to == 0) 0 else adapter.maxIndent(if (from >= to) to - 1 else to, task)
@@ -127,7 +127,7 @@ class DragAndDropRecyclerAdapter(
                 actionState: Int,
                 isCurrentlyActive: Boolean) {
             var dX = dXOrig
-            val vh = viewHolder as ViewHolder
+            val vh = viewHolder as TaskViewHolder
             val task = vh.task
             val shiftSize = vh.shiftSize
             if (actionState == ItemTouchHelper.ACTION_STATE_DRAG) {
@@ -159,7 +159,7 @@ class DragAndDropRecyclerAdapter(
         override fun clearView(
                 recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
             super.clearView(recyclerView, viewHolder)
-            val vh = viewHolder as ViewHolder
+            val vh = viewHolder as TaskViewHolder
             vh.isMoving = false
             dragging = false
             drainQueue()
diff --git a/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.kt b/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.kt
index c26a8ed0e..b21677526 100644
--- a/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.kt
+++ b/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.kt
@@ -10,19 +10,19 @@ import com.todoroo.astrid.api.Filter
 import com.todoroo.astrid.dao.TaskDao
 import org.tasks.data.TaskContainer
 import org.tasks.intents.TaskIntents
-import org.tasks.tasklist.ViewHolder.ViewHolderCallbacks
+import org.tasks.tasklist.TaskViewHolder.ViewHolderCallbacks
 
 abstract class TaskListRecyclerAdapter internal constructor(
         private val adapter: TaskAdapter,
         private val viewHolderFactory: ViewHolderFactory,
         private val taskList: TaskListFragment,
-        private val taskDao: TaskDao) : RecyclerView.Adapter<ViewHolder>(), ViewHolderCallbacks, ListUpdateCallback, TaskAdapterDataSource {
+        private val taskDao: TaskDao) : RecyclerView.Adapter<TaskViewHolder>(), ViewHolderCallbacks, ListUpdateCallback, TaskAdapterDataSource {
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TaskViewHolder {
         return viewHolderFactory.newViewHolder(parent, this)
     }
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: TaskViewHolder, position: Int) {
         val task = getItem(position)
         if (task != null) {
             holder.bindView(task, taskList.getFilter())
@@ -39,11 +39,11 @@ abstract class TaskListRecyclerAdapter internal constructor(
         taskList.loadTaskListContent()
     }
 
-    override fun onClick(viewHolder: ViewHolder) {
+    override fun onClick(taskViewHolder: TaskViewHolder) {
         if (taskList.isActionModeActive) {
-            toggle(viewHolder)
+            toggle(taskViewHolder)
         } else {
-            taskList.onTaskListItemClicked(viewHolder.task.getTask())
+            taskList.onTaskListItemClicked(taskViewHolder.task.getTask())
         }
     }
 
@@ -54,12 +54,12 @@ abstract class TaskListRecyclerAdapter internal constructor(
         }
     }
 
-    override fun onLongPress(viewHolder: ViewHolder): Boolean {
+    override fun onLongPress(taskViewHolder: TaskViewHolder): Boolean {
         if (!dragAndDropEnabled()) {
             taskList.startActionMode()
         }
-        if (taskList.isActionModeActive && !viewHolder.isMoving) {
-            toggle(viewHolder)
+        if (taskList.isActionModeActive && !taskViewHolder.isMoving) {
+            toggle(taskViewHolder)
         }
         return true
     }
@@ -73,9 +73,9 @@ abstract class TaskListRecyclerAdapter internal constructor(
         taskList.broadcastRefresh()
     }
 
-    fun toggle(viewHolder: ViewHolder) {
-        adapter.toggleSelection(viewHolder.task)
-        notifyItemChanged(viewHolder.adapterPosition)
+    fun toggle(taskViewHolder: TaskViewHolder) {
+        adapter.toggleSelection(taskViewHolder.task)
+        notifyItemChanged(taskViewHolder.adapterPosition)
         if (adapter.getSelected().isEmpty()) {
             taskList.finishActionMode()
         } else {
diff --git a/app/src/main/java/org/tasks/tasklist/ViewHolder.java b/app/src/main/java/org/tasks/tasklist/TaskViewHolder.java
similarity index 98%
rename from app/src/main/java/org/tasks/tasklist/ViewHolder.java
rename to app/src/main/java/org/tasks/tasklist/TaskViewHolder.java
index a1bee319a..309f51961 100644
--- a/app/src/main/java/org/tasks/tasklist/ViewHolder.java
+++ b/app/src/main/java/org/tasks/tasklist/TaskViewHolder.java
@@ -30,7 +30,7 @@ import org.tasks.ui.CheckBoxProvider;
 import org.tasks.ui.ChipProvider;
 import org.threeten.bp.format.FormatStyle;
 
-public class ViewHolder extends RecyclerView.ViewHolder {
+public class TaskViewHolder extends RecyclerView.ViewHolder {
 
   private final Activity context;
   private final Preferences preferences;
@@ -78,7 +78,7 @@ public class ViewHolder extends RecyclerView.ViewHolder {
   private int minIndent;
   private int maxIndent;
 
-  ViewHolder(
+  TaskViewHolder(
       Activity context,
       ViewGroup view,
       Preferences preferences,
@@ -336,13 +336,13 @@ public class ViewHolder extends RecyclerView.ViewHolder {
 
     void onCompletedTask(TaskContainer task, boolean newState);
 
-    void onClick(ViewHolder viewHolder);
+    void onClick(TaskViewHolder taskViewHolder);
 
     void onClick(Filter filter);
 
     void toggleSubtasks(TaskContainer task, boolean collapsed);
 
-    boolean onLongPress(ViewHolder viewHolder);
+    boolean onLongPress(TaskViewHolder taskViewHolder);
 
     void onChangeDueDate(TaskContainer task);
   }
diff --git a/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.java b/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.java
index aae09503d..945f8b90e 100644
--- a/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.java
+++ b/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.java
@@ -57,8 +57,8 @@ public class ViewHolderFactory {
     rowPadding = convertDpToPixels(metrics, preferences.getInt(R.string.p_rowPadding, 16));
   }
 
-  ViewHolder newViewHolder(ViewGroup parent, ViewHolder.ViewHolderCallbacks callbacks) {
-    return new ViewHolder(
+  TaskViewHolder newViewHolder(ViewGroup parent, TaskViewHolder.ViewHolderCallbacks callbacks) {
+    return new TaskViewHolder(
         (Activity) context,
         (ViewGroup)
             LayoutInflater.from(context).inflate(R.layout.task_adapter_row, parent, false),